Merge "Implement permission revoke with reason" into rvc-dev am: cee666eba9

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

Change-Id: I90ba41d75359c462c163b70aad470b85c4843915