Merge "Fix duplicate permission privilege escalation" into tm-dev am: 6953052d

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



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