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

Change-Id: I71b4dcb8806b672cda969861808c767d22a05580