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: I3a5dbdee535d44cc222977e21f1dd8e24233a19c