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

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

Change-Id: I7a1419b8be0fc0abc61ab0dda76313c312643840