[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: 473bb58e -s ours am: 8eee1b28 -s ours am: 3972a5c0 -s ours am: 61b11091 -s ours am: fa231df5 -s ours

am skip reason: skipped by user mrulhania

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



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