Merge "Suppress DTMF tone start when a call is already held."
am: 948bfab80a

Change-Id: I66c159687b9352c279f057d3fd92505c93282108