Merge "Ensure hold tones are always played."
am: fcd2dfbce2

Change-Id: Iebfde283483a4ddda33b2e891f3dedd01d857353