[automerger skipped] Fix a bug in UserSystemPackageInstaller#installWhitelistedSystemPackages am: b2fafea71b -s ours

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

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

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