Merge "Infinite loop when migrating calendar widget" into rvc-d1-dev am: 4527d2dbb2 am: f96e2b89c3 am: 2342af53f8

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

Change-Id: I7c590c4b84cc1852e7ba805c43d854160b2d57b0