Merge \"Add disable add call during video call extra and carrier config key\" into nyc-mr1-dev
am: 2cd8281a23

Change-Id: I98ed6adcc49525db82c09a98e2c632894a4a0bc9