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

Change-Id: I16f6865bcb5ab693dd5e9b6e93c16eb72a4bc19e