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

Merge "[automerger skipped] Merge "[pm] forbid deletion of protected packages" into sc-dev am: b2abf263 -s ours am: 74663b36 -s ours am: 61e52240 -s ours am: 7848fdd5 -s ours am: 380e4ee3 -s ours" into tm-d1-dev-plus-aosp