Merge "Catch NPE when reportInstallationToSecurityLog" into main

        if (!SecurityLog.isLoggingEnabled()) {

            return;

        }

        // TODO: Remove temp try-catch to avoid IllegalStateException. The reason is because

        //  the scan result is null for installExistingPackageAsUser(). Because it's installing

        //  a package that's already existing, there's no scanning or parsing involved

        try {

            final PackageSetting ps = mInstallRequest.getScannedPackageSetting();

            if (ps == null) {

                return;

                SecurityLog.writeEvent(SecurityLog.TAG_PACKAGE_UPDATED, packageName, versionCode,

                        userId);

            }

        } catch (IllegalStateException | NullPointerException e) {

            // no-op

        }

    }

    private static void reportUninstallationToSecurityLog(String packageName, long versionCode,