[automerger skipped] Ensure permissions are revoked on state changes am: 84c1247a7e am: eeae60d82f -s ours
am skip reason: Change-Id I0dec9eb7c2fecd3147e33e04d3f79f6dffcf7721 with SHA-1 a28931a098 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12933477
Change-Id: Ie914af8c130858949e6dfcdee3201af02d6e3472
This commit is contained in: