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

Change-Id: I7ec931e84d8f3b293fdbaad15d6ea0f9d39fb7e2