[automerger skipped] [conflict] Moving PackageManagerServiceTests to their own suite. am: d4e51d102f am: bbacb30ce5 -s ours

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

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

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