Merge "Enable PackageManagerService snapshots"