Merge "Revert "Expose role API for Settings on RoleManager.""