Merge "Use ToneGenerator::tone_type consistently"