[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: b6a93991 -s ours am: b16fe4b2 -s ours am: c82d89a2 -s ours

am skip reason: skipped by user mrulhania

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



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