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

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

Change-Id: Ie675e217a276c0b8baaded52c995180d5f94c867