Ensure permissions are revoked on state changes am: bc71724034

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

Change-Id: I269a933829055b3dcdcce571e20eb7f4965d9582