Merge changes from topic "MonthByWeek/SimpleWeeks" am: 68ba903864

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

Change-Id: I86aa3e4835b6c9c3853fb92ca864eae5f1429c0d