Merge "Redo DtmfLocalTonePlayer" am: f9592be953
am: 5faa4d15a0

Change-Id: I58b836569fe8d5b4d11ab90b3cad8081f65f9449