Merge "Revert^2 "Add HAL changes for FORWARD_COLLISION_WARNING_STATE""