Merge "Unhide UserManager.hasUserRestriction()."