Ensure permissions are revoked on state changes am: 84c1247a7e am: 9259e1b2be am: 3668965749

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

Change-Id: Ie50f3f79e5e3b6d7cf3315fe4240086bed39473d