Merge "Ensure connection video capabilities can only be set if video supported." into nyc-dev
am: b71c70b5
* commit 'b71c70b5':
Ensure connection video capabilities can only be set if video supported.
Change-Id: I86d3f49730660527025dda3d56603e1ee0c7b61e