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

Change-Id: I84dcada93ddef647deea7ce1fe94e2b05d815189