[automerger skipped] Merge "Fix a bug in...

[automerger skipped] Merge "Fix a bug in UserSystemPackageInstaller#installWhitelistedSystemPackages" am: b8549639 -s ours am: 80a2e770 -s ours

am skip reason: Merged-In I4325565d8acaeffd4aab5a4b6295d325edb738a9 with SHA-1 cb2ba4bd is already in history

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



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