Merge "Restore old audio behavior for RTT emergency calls"
am: e4b693b705

Change-Id: I2cd4b14489cee1a64ced9df7c220daaa7f395e32