Merge changes from topic "CalendarAppWidgetProvider" am: 33057f579b am: 98b0f36e15 am: fed6a94c43

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

Change-Id: I630d3a59526089687056393cf8326cac537aa02c