Merge "Fix flakiness of sensor VTS test cases" into oreo-dev
am: 863c52448e  -s ours

Change-Id: Ifcf5e50c3c1d2a6058efba10d09160cc7fa2264d