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

Change-Id: I1464011b18909bdacded952a7fff8ee5a0badd6c