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

Change-Id: Ibea824bc3f57fd566391883ccb564014c8a34825