Merge "Renamed some permission check methods in UserManagerService"