Merge "Remove using hidden UserHandle APIs"