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

* changes:
  Merge "[automerger skipped] Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d73 am: e545a5db -s ours am: 94c17650 -s ours am: 7aaba89b -s ours am: 89ed3dc2 -s ours am: a3452e42 -s ours am: 6b7d2d10 -s ours am: 3aa32715 -s ours" into tm-d1-dev-plus-aosp am: c25f0fe0 -s ours
  [automerger skipped] Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d73 am: e545a5db -s ours am: 94c17650 -s ours am: 7aaba89b -s ours am: 89ed3dc2 -s ours am: a3452e42 -s ours am: 6b7d2d10 -s ours am: 3aa32715 -s ours am: d57b1c21 -s ours