[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "PackageManagerServiceTests-tm-qpr-dev" into tm-qpr-dev am: 051e23fa am: 270d6cfe -s ours

am skip reason: Merged-In I3d99829a735bc09b52ef77d75d875ca547d53f01 with SHA-1 d7c440b1 is already in history

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



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