Merge \"Change to hide video telephony setting if VT is not provisioned.\" into nyc-mr1-dev
am: d1e998cd5c

Change-Id: I2e819a58bdc2a502796a63078071fcc9a7b4cfe7