Merge "Partially revert ce54397368dc98182d7b4eb2ff3c142bbd87e39d" into oc-mr1-dev

am: 2cdfda1232

Change-Id: If3060eb7b21a3bb5f6b34b36de012cb35e4f03c9

services/core/java/com/android/server/pm/PackageManagerService.java

@@ -9804,19 +9804,6 @@ public class PackageManagerService extends IPackageManager.Stub
                     compilerFilter,
                     dexoptFlags));
 
-            if (pkg.isSystemApp()) {
-                // Only dexopt shared secondary dex files belonging to system apps to not slow down
-                // too much boot after an OTA.
-                int secondaryDexoptFlags = dexoptFlags |
-                        DexoptOptions.DEXOPT_ONLY_SECONDARY_DEX |
-                        DexoptOptions.DEXOPT_ONLY_SHARED_DEX;
-                mDexManager.dexoptSecondaryDex(new DexoptOptions(
-                        pkg.packageName,
-                        compilerFilter,
-                        secondaryDexoptFlags));
-            }
-
-            // TODO(shubhamajmera): Record secondary dexopt stats.
             switch (primaryDexOptStaus) {
                 case PackageDexOptimizer.DEX_OPT_PERFORMED:
                     numberOfPackagesOptimized++;