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

Change-Id: I35924cb2517c5bd05e3976cbc30bec982afb9ae8