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

Change-Id: I0d93f6a7b21ac8edc875ab0e853e01ede98f4f89