[automerger skipped] Merge "[conflict] Moving PackageManagerServiceTests to...

[automerger skipped] Merge "[conflict] Moving PackageManagerServiceTests to their own suite. am: b8859a20" into tm-qpr-dev-plus-aosp am: edb489cb -s ours

am skip reason: Merged-In Iacc89c7525d8d9beec39c242bfc305ad08844580 with SHA-1 83e09119 is already in history

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



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