Merge "Add CarrierConfig option for removing Hold during Ims Calls" into nyc-mr1-dev