[automerger skipped] Merge "[pm] forbid deletion of protected packages" into...

[automerger skipped] Merge "[pm] forbid deletion of protected packages" into tm-qpr-dev am: fbab258d -s ours am: 2d1280fd -s ours

am skip reason: Merged-In Iba408e536b340ea5d66ab499442c0c4f828fa36f with SHA-1 3ac6aa1e is already in history

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



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