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

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

Change-Id: I20411966b3ed93034b0b3cd4513cb61caec8e10d