Fixes: 158448787
When the day is earlier in than the minimum date, but
the year is later, then the year is changed, the date
gets set to a day that is earlier than the minimum date.
This CL ensures that the year change can't bring the
date outside of the range of minimum to maximum dates.
Test: manual testing
Change-Id: I0034bd513275267ecf9554f673533852e68dd854
4f2b9ad2bd