Merge "Match app op permission type to PermissionManager" into udc-dev am: e997a46f am: f1815d6c

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



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