Merge "Add MANAGE_ROLE_HOLDERS to Telephony"