[automerger skipped] Merge "DO NOT MERGE: Amend task tests for VR Headset." into oreo-cts-dev
am: 2888950431  -s ours

Change-Id: I872433e9edf7df1d27c68418cace7c43984986ab