[automerger skipped] [automerge] Fix duplicate permission privilege escalation 2p: 548edbb850 am: a1d776d747 -s ours am: 60a6a58157 -s ours am: faeba61b0a -s ours am: 2fee262efc -s ours
am skip reason: Merged-In I9bc839836786a0876e67fd73c05f8944bb532249 with SHA-1 a19e17e32c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18002380
Change-Id: Ie74f8738cff98d6c91bcadbe3481db9fb4d2f2fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: