Merge changes from topic "MonthByWeekFragment" am: b93cd7f52c am: de808f653a

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

Change-Id: I91724a1851ee32c8c56f5d6252bbe753e5df3841