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

Change-Id: I1111bc80ec7dff95e6e1a5f53da22d5e65042060