[automerger skipped] Ensure permissions are revoked on state changes am: bc71724034 am: f31a906eba -s ours am: cef551dc4f -s ours am: e980626fb4 -s ours am: d0efe506a3 -s ours am: a4b14d8cd0 -s ours

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

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

Change-Id: Ic9b313a29db9c07463687a79ba5e16ebbd5f2a7b