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

Change-Id: Id04caa1bf0a545e10b30173fb83790e0651a333a