Merge "Add carrier config to support local disconnect of empty IMS conference." into rvc-dev am: 9b82cceb59 am: 92fc19e428

Change-Id: I64d5a10c67af990103e89ede97e21d71b81c3c5b