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: I9c0ac5aa74b1ba4d4d46bfc1e671f306de378014