[automerger skipped] Ensure permissions are revoked on state changes am: bc717240 am: f31a906e -s ours am: cef551dc -s ours am: 4fdadd4b -s ours am: 2abe3df9 -s ours

am skip reason: Change-Id I0dec9eb7c2fecd3147e33e04d3f79f6dffcf7721 with SHA-1 84c1247a is in history

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

Change-Id: I3ae2bfe5d88f1e5ac2dab34b5d0d435b503b7e46