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: a3452e42 -s ours am: 6b7d2d10 -s ours am: 58b2b3e9 -s ours am: 4a55da14 -s ours" into tm-qpr-dev-plus-aosp