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