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

Change-Id: I0d7fa65ed533e153a7e184d661df9ae02c77ecd5