[automerger skipped] [conflict] Moving PackageManagerServiceTests to their own suite. am: b8859a2055 am: eda2dda95e -s ours
am skip reason: Merged-In Iacc89c7525d8d9beec39c242bfc305ad08844580 with SHA-1 83e0911904 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20673313
Change-Id: I1c7c63e9ba9ca4c3e5308d7476a829ab0657d28e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: