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

Merge "[automerger skipped] [automerge] Fix duplicate permission privilege escalation 2p: 548edbb8 am: a1d776d7 -s ours am: 60a6a581 -s ours am: faeba61b -s ours" into tm-d1-dev-plus-aosp am: fd5053a2 -s ours am: 0e95bd87 -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: I56e8ef9a7ae1211d7207138dac00959082bf7b7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>