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: 22bfd75a am: 339544e2

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

Change-Id: I1557aec4d08aea2046854107713665f176011ad0