Merge "Skip rmdex when ART Service is in use."

            if (instructionSets == null) {

                throw new IllegalStateException("instructionSet == null");

            }

            // TODO(b/265813358): ART Service currently doesn't support deleting optimized artifacts

            // relative to an arbitrary APK path. Skip this and rely on its file GC instead.

            if (!DexOptHelper.useArtService()) {

                String[] dexCodeInstructionSets = getDexCodeInstructionSets(instructionSets);

                for (String codePath : allCodePaths) {

                    for (String dexCodeInstructionSet : dexCodeInstructionSets) {

                    // TODO(b/251903639): Call into ART Service.

                        try {

                            mPm.mInstaller.rmdex(codePath, dexCodeInstructionSet);

                        } catch (LegacyDexoptDisabledException e) {

                }

            }

        }

    }

    void cleanUpForMoveInstall(String volumeUuid, String packageName, String fromCodePath) {

        final String toPathName = new File(fromCodePath).getName();