Merge "Remove UM.isUserOfType(userHandle) API"