Merge cherrypicks of [14121680, 14121888] into sc-release

    }

    private void convertSplitPermissions(ParsingPackage pkg) {

        // STOPSHIP(b/183905675): REMOVE THIS TERRIBLE, HORRIBLE, NO GOOD, VERY BAD HACK

        if ("com.android.chrome".equals(pkg.getPackageName())

                && 445500383 == pkg.getVersionCode()) {

            pkg.setTargetSdkVersion(Build.VERSION_CODES.R);

        }

        final int listSize = mSplitPermissionInfos.size();

        for (int is = 0; is < listSize; is++) {

            final PermissionManager.SplitPermissionInfo spi = mSplitPermissionInfos.get(is);