Merge "[pm] fix PackageManagerServiceTest"