Merge "Rename LegacyRoleHoldersResolver to LegacyRoleHolderProvider for system API."