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

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

Change-Id: I2ec59fde89cf82577191f932e8cdb883a046077a