Merge changes from topic 'am-91abecac10b94043be1419edddac2a94' into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Add CarrierConfig to remove hold during Ims Calls\" into nyc-mr1-dev am: dee7dffb
Add CarrierConfig to remove hold during Ims Calls am: c8601013