Merge "[automerger skipped] Merge "Fix duplicate permission privilege...

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: b0ec7cce -s ours am: a29bc941 -s ours am: 8c88d030 -s ours am: 0d1e3e76 -s ours" into tm-d1-dev-plus-aosp