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 am: 0ab7a541 -s ours

am skip reason: Merged-In I1910dca44104e35a57eba4acfa8188cd9b8626ac with SHA-1 f9a9dc72 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18408986



Change-Id: I7bcb3385760aee290cf13bec3e183aa159c03161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>