Merge "Packages for PackageManagerService tests"