Merge "Enable support for playing call recording tone for carrier." am: 7a2f5110c8 am: eba4f09c68
am: 194aab066f

Change-Id: I875b760c0d73a185d867731e3cc2ed1d86734726