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

Change-Id: Iefaff0081b80f8f67a273a4faeae040a8e0fef22