Merge "Match app op permission type to PermissionManager" into udc-dev