Merge "Refactor RoleManagerService to use system API when possible."