Merge "Don't reset permission granted by role." into rvc-dev am: f37bed75 am: e5124bc9 am: 2f8e33ea am: 63077108

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

Change-Id: I677adb08711bb24952a6f560b0dfdc08a1982e2e