Fix issues when using java.sql.Date as DateField range (#15342)

Change-Id: I656cc0600f929239605e17ab9cf71dc1ba96582f