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

Change-Id: I1b9aab933c458bcbc20fa6bfca893827dea16aea