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

Change-Id: I8bfb96119049dc7eeedcf71f9e336a1193cbea20