[automerger skipped] [automerge] Fix duplicate permission privilege escalation...

[automerger skipped] [automerge] Fix duplicate permission privilege escalation 2p: 548edbb8 am: 7c95fa70 am: c18c6ee3 -s ours am: 9063daac -s ours am: f1ff33d5 -s ours am: cd95813c -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: Ia43ba03e22b2c1df0c66dc6a49384d102ef5df5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>