Merge "Fix flakiness of sensor VTS test cases" into oreo-dev