Merge "UserSystemPackageInstaller auto-treats static overlays"