Merge "Revert "SensorHAL: add moisture detection"" into main