Merge "Fix flakiness of sensor VTS test cases" into oreo-dev am: 863c52448e  -s ours am: 8b12cc9fe6  -s ours am: 9732e2b7bf  -s ours
am: ca1cd6b141  -s ours

Change-Id: Ie1eb9e0d1e02545f536261fd15c2c1fbdf672bc0