[automerger skipped] Merge "[pm] fix PackageManagerServiceTest" am: 1bec5a05 am: d7916500 am: a82f4dd3 -s ours am: 6425b9c9 -s ours am: 97de3574 -s ours

am skip reason: Merged-In I8556f027c425a746424aa19fdb7fede38205ffea with SHA-1 a425dda7 is already in history

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



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