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

[automerger skipped] Merge "Merge "Fix duplicate permission privilege escalation" into tm-dev am: 6953052d am: 5a752a1f" into tm-d1-dev-plus-aosp am: 1d312920 -s ours am: dba04293 -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/+/17749786



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