Merge "Allow UserSystemPackageInstaller to ignore OTAs"