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

Change-Id: I20fffea408fe668f959480ce6376dcde77897d9b