Merge "CTS: Device with UI mode set to VR_HEADSET is identified as a watch" into oreo-cts-dev