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

Change-Id: Ic2526d1701f8901fdfa14a270967f437f2040e6f