[automerger skipped] Ensure permissions are revoked on state changes am: bc717240 am: f31a906e -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: Icac8356b34363d40b5201cd5affc327b7c0a6e35