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

[automerger skipped] Merge "Fix a bug in UserSystemPackageInstaller#installWhitelistedSystemPackages" into tm-qpr-dev am: 654f1a6b am: f3d0bf8b -s ours

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

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



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