Merge \"Add CarrierConfig option for removing Hold during Ims Calls\" into nyc-mr1-dev
am: 864db7828a

Change-Id: If5c82f36ce17a3fd80dffdc3866021b89b340c2c