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

Change-Id: Ie9b8dcefbeb2afe64016d191c6578b7ace5b3be3