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

[automerger skipped] Ensure permissions are revoked on state changes am: 3dfb5446 am: ebfe0735 am: b2152f32 -s ours am: ff63084c -s ours am: fb70a5ea -s ours

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

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

Change-Id: If4e006701ad30611252dd992419bb83c1a801de1