Merge "Move CronetInTetheringApexDefaults to //external/cronet" into main