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

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

Change-Id: Ib221c620166a2daf0d8b3cc1fab55d18c17c0567