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

Change-Id: If6fb25b669a74e7e586736c04101a42ab6adcffe