Merge "Merge "DO NOT MERGE: Skip theme tests on vr headsets" into oreo-cts-dev am: 41b50104e7  -s ours" into oreo-mr1-cts-dev