diff --git a/aosp/frameworks/base/core/java/android/os/storage/StorageManager.java b/aosp/frameworks/base/core/java/android/os/storage/StorageManager.java
index e9daa4f8974bb775b66060252d41ac312af3562c..a43c924a28958a364e294abcea560e0df9af78a0 100644
--- a/aosp/frameworks/base/core/java/android/os/storage/StorageManager.java
+++ b/aosp/frameworks/base/core/java/android/os/storage/StorageManager.java
@@ -280,6 +280,8 @@ public class StorageManager {
     public static final int FLAG_STORAGE_CE = IInstalld.FLAG_STORAGE_CE;
     /** {@hide} */
     public static final int FLAG_STORAGE_EXTERNAL = IInstalld.FLAG_STORAGE_EXTERNAL;
+    /** {@hide} */
+    public static final int FLAG_SKIP_SELINUX_CHECK = IInstalld.FLAG_SKIP_SELINUX_CHECK;
 
     /** {@hide} */
     public static final int FLAG_FOR_WRITE = 1 << 8;
diff --git a/aosp/frameworks/base/services/core/java/com/android/server/pm/PackageManagerService.java b/aosp/frameworks/base/services/core/java/com/android/server/pm/PackageManagerService.java
index 03367cbbaab3c828be7a4ccbed050ad6bbfa2630..1a96da36f4c030f3dbf4603629c8b60346f64cd9 100644
--- a/aosp/frameworks/base/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/aosp/frameworks/base/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -22996,7 +22996,7 @@ public class PackageManagerService extends IPackageManager.Stub
         UserManagerInternal umInternal = mInjector.getUserManagerInternal();
         StorageManagerInternal smInternal = mInjector.getStorageManagerInternal();
         for (UserInfo user : mUserManager.getUsers(false /*excludeDying*/)) {
-            final int flags;
+            int flags;
             if (umInternal.isUserUnlockingOrUnlocked(user.id)) {
                 flags = StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE;
             } else if (umInternal.isUserRunning(user.id)) {
@@ -23005,6 +23005,10 @@ public class PackageManagerService extends IPackageManager.Stub
                 continue;
             }
 
+            if (mSettings.isAssignAppUid(ps.appId)) {
+                flags |= StorageManager.FLAG_SKIP_SELINUX_CHECK;
+            }
+
             if (ps.getInstalled(user.id)) {
                 // TODO: when user data is locked, mark that we're still dirty
                 prepareAppDataLIF(pkg, user.id, flags);
diff --git a/aosp/frameworks/base/services/core/java/com/android/server/pm/Settings.java b/aosp/frameworks/base/services/core/java/com/android/server/pm/Settings.java
index 1a6c69a4326b1e4e5fa6d313e77d3b2c3bddd412..94558a2baf3131e0bcb11447d2cbef7904078b63 100644
--- a/aosp/frameworks/base/services/core/java/com/android/server/pm/Settings.java
+++ b/aosp/frameworks/base/services/core/java/com/android/server/pm/Settings.java
@@ -1136,6 +1136,10 @@ public final class Settings {
         return true;
     }
 
+    public boolean isAssignAppUid(int uid) {
+        return mHwSettings.isAssignAppUid(uid);
+    }
+
     /** Gets the setting associated with the provided App ID */
     public SettingBase getSettingLPr(int appId) {
         if (mHwSettings.isAssignAppUid(appId)) {
diff --git a/aosp/frameworks/native/cmds/installd/InstalldNativeService.cpp b/aosp/frameworks/native/cmds/installd/InstalldNativeService.cpp
index 0bc7f71b9583a40f3b749e0856f9a91fdf5e9970..916f1aa4564c80afde9b7247b40846f6371a08c9 100644
--- a/aosp/frameworks/native/cmds/installd/InstalldNativeService.cpp
+++ b/aosp/frameworks/native/cmds/installd/InstalldNativeService.cpp
@@ -486,7 +486,7 @@ binder::Status InstalldNativeService::createAppData(const std::unique_ptr<std::s
         }
 
         // Consider restorecon over contents if label changed
-        if (is_selinux_enabled() && (restorecon_app_data_lazy(path, seInfo, uid, existing) ||
+        if (!(flags & FLAG_SKIP_SELINUX_CHECK) && is_selinux_enabled() && (restorecon_app_data_lazy(path, seInfo, uid, existing) ||
                 restorecon_app_data_lazy(path, "cache", seInfo, uid, existing) ||
                 restorecon_app_data_lazy(path, "code_cache", seInfo, uid, existing))) {
             return error("Failed to restorecon " + path);
@@ -512,6 +512,7 @@ binder::Status InstalldNativeService::createAppData(const std::unique_ptr<std::s
     if (flags & FLAG_STORAGE_DE) {
         auto path = create_data_user_de_package_path(uuid_, userId, pkgname);
         bool existing = (access(path.c_str(), F_OK) == 0);
+        bool skip_selinux_check = existing ? (flags & FLAG_SKIP_SELINUX_CHECK) : false;
 
         if (prepare_app_dir(path, targetMode, uid) ||
                 prepare_app_cache_dir(path, "cache", 02771, uid, cacheGid) ||
@@ -521,7 +522,7 @@ binder::Status InstalldNativeService::createAppData(const std::unique_ptr<std::s
         }
 
         // Consider restorecon over contents if label changed
-        if (is_selinux_enabled() && (restorecon_app_data_lazy(path, seInfo, uid, existing) ||
+        if (!skip_selinux_check && is_selinux_enabled() && (restorecon_app_data_lazy(path, seInfo, uid, existing) ||
                 restorecon_app_data_lazy(path, "cache", seInfo, uid, existing) ||
                 restorecon_app_data_lazy(path, "code_cache", seInfo, uid, existing))) {
             return error("Failed to restorecon " + path);
diff --git a/aosp/frameworks/native/cmds/installd/binder/android/os/IInstalld.aidl b/aosp/frameworks/native/cmds/installd/binder/android/os/IInstalld.aidl
index 3647e20c33ee3a7e1f1359bc0e7301cb96e02350..b9fad60cf0da7c18421b1fdf3696f29b42a35201 100644
--- a/aosp/frameworks/native/cmds/installd/binder/android/os/IInstalld.aidl
+++ b/aosp/frameworks/native/cmds/installd/binder/android/os/IInstalld.aidl
@@ -132,6 +132,7 @@ interface IInstalld {
     const int FLAG_STORAGE_DE = 0x1;
     const int FLAG_STORAGE_CE = 0x2;
     const int FLAG_STORAGE_EXTERNAL = 0x4;
+    const int FLAG_SKIP_SELINUX_CHECK = 0x80;
 
     const int FLAG_CLEAR_CACHE_ONLY = 0x10;
     const int FLAG_CLEAR_CODE_CACHE_ONLY = 0x20;
diff --git a/aosp/frameworks/native/cmds/installd/installd_constants.h b/aosp/frameworks/native/cmds/installd/installd_constants.h
index b5ee48164569d03e584e4450ab58ea0f40cbd47f..ee3011dba45f8e9beaa71c691059f8dd8806cfb6 100644
--- a/aosp/frameworks/native/cmds/installd/installd_constants.h
+++ b/aosp/frameworks/native/cmds/installd/installd_constants.h
@@ -76,6 +76,7 @@ constexpr int DEXOPT_MASK =
 // NOTE: keep in sync with StorageManager
 constexpr int FLAG_STORAGE_DE = 1 << 0;
 constexpr int FLAG_STORAGE_CE = 1 << 1;
+constexpr int FLAG_SKIP_SELINUX_CHECK = 1 << 7;
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))