[automerger skipped] Ensure permissions are revoked on state changes am:...

[automerger skipped] Ensure permissions are revoked on state changes am: 84c1247a am: 9259e1b2 am: a160b9eb am: e8374443 -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/+/12933477

Change-Id: I8f9b6086bab04098f161fc819bafbdc36f78d40d