[automerger skipped] Merge "Fix flaky ScheduleCalendarTest" am: 08667cc9c1 am: 97f1fa1688
am: 690f5f81c6  -s ours

Change-Id: I9a0085d528ca9ed9751d03d23eb7f320b3fa7de8