Merge "Add carrier config to always play hold tone when remotely held." am: c352f5f8 am: c9187f91 am: e31e0d5a Change-Id: Ic14315ea8a85fe9108e765fb32ce23b68ff31756