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

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



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