Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d

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



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