Fix CEL Java sortBy macro expansion to preserve element type and avoid heterogeneous list literals.

Fix CEL Java sortBy macro expansion to preserve element type and avoid heterogeneous list literals. #1140