Merge "DO NOT MERGE: Disable SignificantMotionTest on VR headset" into oreo-cts-dev
am: a81daf2f5a  -s ours

Change-Id: I2c8a9d088b3540b50d74f9ae980718e21b5b9fe5