Merge "Presubmit test for PackageManager"