Merge "Merge "Fix for com.android.cts.verifier.sensors.RVCVXCheckTestActivity" into oreo-cts-dev am: 0d735c0a12" into oreo-mr1-cts-dev am: cf4826d022 am: 04df4e207b
am: a964bfff66

Change-Id: I93699ce2b5796de43fb211789aa2c4781fba1d6c