Merge "Infinite loop when migrating calendar widget" into rvc-d1-dev am: 4527d2dbb2 am: 725a836885

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

Change-Id: Ie5b64771c129f72dcf877c64b200a231a49f8eae