Merge "Test: skip video test for watch" into oreo-mr1-cts-dev am: 677fc6381f
am: 28e52491a9

Change-Id: I49e87de71386cc2b6e0b4dfeb50f202f10012148