Merge changes from topic "MonthWeekEventsView" am: a657045532 am: dcb8ac8c97

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1763591

Change-Id: I29ba8cd7809ab44217d18115b95b70c236a0ff66