Merge "CTS: Prevent certain tests from running in VR mode" into oreo-cts-dev