Merge changes from topic "am-e2bb2aacf9484c3eac5ee57d1e002586" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-86d37df06f3b4cba87f03386fed73973" into sc-qpr1-dev am: 870c0fe4 -s ours am: 0d9aef81 -s ours am: 98145f69 -s ours am: 179e72b1 -s ours
  [automerger skipped] [automerge] [pm] forbid deletion of protected packages 2p: dba7ceb5 am: 989782a0 -s ours am: 2286c37d -s ours am: faba6e75 -s ours am: 3ee3f036 -s ours