Merge "Check carrier config option for removing hold capability during ims calls" am: 8e378eabfc am: 8b8eefebcb
am: 53ca13763c

Change-Id: Ifa2eb92a37ac983a87219a91bb17b8fa1dea0d89