Merge changes from topic "CalendarAppWidgetService" am: aa98535cdb am: d9ace364ed

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

Change-Id: Ic9e9d3072e1b012fb2355a4d39e7739da1445d6c