Merge "Redo DtmfLocalTonePlayer"
am: f9592be953

Change-Id: I8db00beccda8ba4500d8e907c984b9c1971f832b