Merge "Fix VTS SensorsHidl Test Failures"