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

[automerger skipped] Merge "Prevent accidental creation of PackagePreferences for non-existing packages" into tm-qpr-dev am: 44248ae2 -s ours am: 04ab9d09 -s ours am: dc48212b -s ours

am skip reason: Merged-In I7d0717aed9fb26490f68801c9220833f2bed8e23 with SHA-1 80df4860 is already in history

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



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