Merge "Add call recording tone support."
am: 8d5b08c430

Change-Id: Ie99332c73bed7681e05a2e7603da2c5c573a95f3