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

Merge "[automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562 am: ae7a1df5 -s ours am: 478c97e5 -s ours am: 526af0d1 -s ours am: 151d75d3 -s ours am: d05066f4 -s ours am: 01a79b5d -s ours am: 0d99f586 -s ours am: 18e656dc -s ours" into tm-d1-dev-plus-aosp