Merge \\"Add onConferenceSupportedChanged callback, carrier config.\\" into nyc-mr1-dev am: 780648be53
am: da457b206e

Change-Id: I8d2c147c2455dcf6dfcedfde43890b4962f7b4cd