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

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

Change-Id: I4ccf891b19df1ad5d5f4921b8fe4bac1bc6a6fca