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

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

Change-Id: I225ae9498e26f785c4be9762f1de22102e5d7d3f