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

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

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

Change-Id: Ib0cb7f017c4482a662fa66eb70f50e1f02635503