Merge "Apply pending AppInfo on Activity override change" into sc-dev

core/java/android/app/ResourcesManager.java

@@ -1158,9 +1158,15 @@ public class ResourcesManager {
                 } else {
                     activityResources.overrideConfig.unset();
                 }
+
                 // Update the Activity's override display id.
                 activityResources.overrideDisplayId = displayId;
 
+                // If a application info update was scheduled to occur in this process but has not
+                // occurred yet, apply it now so the resources objects will have updated paths if
+                // the assets sequence changed.
+                applyAllPendingAppInfoUpdates();
+
                 if (DEBUG) {
                     Throwable here = new Throwable();
                     here.fillInStackTrace();