b/3497123 Fix sorting of non-allday events

Moving 24+h events to allday caused more issues. This queries
non-allday and allday events separately so they all end up in
their respective correct ordering.

Change-Id: I2028346969f38cf72587f6e80fc7e8f005819fc3
2 files changed