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

Change-Id: I71c24e971bf8d36fd5448497b85660be43417632