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

[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: 61b6527f -s ours

am skip reason: skipped by user mrulhania

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18083515



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