Ensure permissions are revoked on state changes am: 3dfb544626 am: ebfe073540

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

Change-Id: I8abf9d6c3d9014bad2a24a2276b9747ac04ff970