Merge "Add UserHandle constants to SystemApi"