Merge "Merge "Add carrier config to always play hold tone when remotely held." am: c352f5f861 am: c9187f9199 am: e31e0d5a7a"