Merge "Don't reset permission granted by role." into rvc-dev am: f37bed75 am: 22bfd75a

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

Change-Id: I7ce58f09e268d5af6c0cac500c6a515e9957a08d