Merge "Infinite loop when migrating calendar widget" into ub-launcher3-rvc-dev am: 8c46b20958

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12151323

Change-Id: Ifc101b5e4b76976cb835d3d0210320fe332ff323