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

[automerger skipped] Merge "Fix duplicate permission privilege escalation" into tm-dev am: 6953052d am: 5a752a1f am: 9a0f29f3 -s ours am: 614a6789 -s ours

am skip reason: Merged-In I9bc839836786a0876e67fd73c05f8944bb532249 with SHA-1 a19e17e3 is already in history

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



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