Merge "Remove deprecateStreamTypeForPlayback from HwAudioSource"