[automerger skipped] Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d7372 am: e545a5dbbf -s ours am: 94c1765004 -s ours am: 7aaba89b77 -s ours am: 89ed3dc229 -s ours

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

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

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