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

Change-Id: I3f94b94d6ba5d6697e9053f33ba807f983628f53