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

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



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