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

Change-Id: I67496b63f6a7f6362faed8c6a8cbff7cd665876c