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

[automerger skipped] Merge "Prevent accidental creation of PackagePreferences for non-existing packages" into tm-dev am: 0f8c8d2a am: 9f291dfd -s ours am: 3e620eb9 -s ours

am skip reason: Merged-In I7d0717aed9fb26490f68801c9220833f2bed8e23 with SHA-1 0dc7bffa is already in history

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



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