Merge "Fix flaky testInBandRingtone"