Merge "Add permission to ap op mappings for all runtime permissions." into mnc-dev