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: a02ff66d -s ours am: 6ea97903 -s ours am: b6a93991 -s ours" into tm-d1-dev-plus-aosp am: 3f350999 -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: I5883bfdb7e1a9683cd1163424d44dd842310c084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>