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

Change-Id: I4fd82816601d638e1d0f57f181d7ce4720d33bef