Merge "Add app op name string for a runtime permission"