Merge "Infinite loop when migrating calendar widget" into rvc-d1-dev am: 4527d2db am: 725a8368 am: b0635897

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

Change-Id: I63399ac0687042121d31a56a966f2be343d1f951