Merge "[pm] fix PackageManagerServiceTest" into udc-dev am: 7b288aa8 am: 59beeed4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23518907



Change-Id: Ia07165cf5b623bdb33ff0f8ed3ea903483722422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>