Merge "Revert^2 "sensorService: use v3 sensor HAL"" into main