Calendar.roll() breaks the year at the beginning of the year, so
use add() instead, which changes larger fields.
Also, only use 4 bins, since the last bin's boundary is not relevant.
Lastly, no need to return Calendar in beginningOfDay.
Fixes http://b/issue?id=2361382
c89b13b962