Merge "ToneGenerator: fix use of STREAM_VOICE_CALL"