Merge "Revert "Add HAL changes for FORWARD_COLLISION_WARNING_STATE""