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

Change-Id: Ic5b3a6089b03771bb0c0e48e0e8e01cbca839b47