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

[automerger skipped] Merge "Prevent accidental creation of PackagePreferences for non-existing packages" into udc-dev am: 05e00548 am: eaf47991 -s ours am: 4b7c9939 -s ours

am skip reason: Merged-In I7d0717aed9fb26490f68801c9220833f2bed8e23 with SHA-1 95b0df38 is already in history

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



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