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

Change-Id: I7676cd437d8a809454acb58ec49ccf481ceb9104