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

Merge "[automerger skipped] [automerge] Fix duplicate permission privilege escalation 2p: 548edbb8 am: 7c95fa70 am: c18c6ee3 -s ours am: 9063daac -s ours am: f1ff33d5 -s ours" into tm-d1-dev-plus-aosp am: 2b7c96b9 -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/+/18002380



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