Merge "Add carrier config to support local disconnect of empty IMS...
Merge "Add carrier config to support local disconnect of empty IMS conference." into rvc-dev am: 9b82cceb am: bf6b30d2 am: 487591e3 am: 5e36313c
Change-Id: I9095290624c9f93c3dc605c97041316c50e06814