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

[automerger skipped] Merge "Fix duplicate permission privilege escalation" into tm-dev am: 6953052d am: 5275acdb am: 849b52a5 am: 8ec7a20f -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: I4e6e8884af133af193ae25568044f48d33566d67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>