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