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

[automerger skipped] Merge "Fix duplicate permission privilege escalation" into tm-dev am: 6953052d am: 5275acdb am: 0b7cdad4 -s ours am: 6d494f51 -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: I51bc637959187a958e06bb9a274c63097b25ee0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>