Merge "[pm] fix PackageManagerServiceTest" into udc-dev