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

Merge "[automerger skipped] Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d am: f689ec94 -s ours am: e1315988 -s ours am: 473bb58e -s ours am: 8eee1b28 -s ours am: 3972a5c0 -s ours am: ed555dcb -s ours" into tm-d1-dev-plus-aosp am: 7ba9b8ac -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/+/18083515



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