Merge "Disable some CTS tests for watches." into cw-f-dev am: 593ee5b784
am: ff4a8aa71b

Change-Id: I4c1672406e6f7097678a114272ba7458fc9a8725