Merge changes from topic "am-26e1961d8df14d378ce17a6da36888df" into tm-qpr-dev-plus-aosp

* changes:
  Merge "[automerger skipped] [automerge] Fix duplicate permission privilege escalation 2p: 548edbb8 am: 7c95fa70 am: c18c6ee3 -s ours am: 9063daac -s ours am: f1ff33d5 -s ours" into tm-d1-dev-plus-aosp am: 2b7c96b9 -s ours
  [automerger skipped] [automerge] Fix duplicate permission privilege escalation 2p: 548edbb8 am: 7c95fa70 am: c18c6ee3 -s ours am: 9063daac -s ours am: f1ff33d5 -s ours am: 9357f041 -s ours