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

Change-Id: I9e12d5af3666df69a65229aa34e898799376a471