Merge "Adjust mock thermal HAL 2.0 mock data"