Merge "Stop using UserHandle' hidden constructor."