Merge "Harden SyncManager against CalendarProvider query results"