[automerger skipped] Merge "Prevent accidental creation of PackagePreferences...

[automerger skipped] Merge "Prevent accidental creation of PackagePreferences for non-existing packages" into udc-qpr-dev am: 54589718 -s ours

am skip reason: Merged-In I7d0717aed9fb26490f68801c9220833f2bed8e23 with SHA-1 236cff68 is already in history

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



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