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

Change-Id: I46f4ccf81f4e931b9132e20f6dac24e140df3cc6