Merge "Respect role granted app op permissions when resetting all op modes."...

Merge "Respect role granted app op permissions when resetting all op modes." into udc-dev am: 84b224f1 am: 161e1583

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



Change-Id: I7f2460f272d4b74df300004231320b5bac18b90b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>