Merge "Infinite loop when migrating calendar widget" into ub-launcher3-rvc-dev am: 8c46b20958 am: 011fa1bac1 am: 835b25d1dd

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

Change-Id: I7cdb94a92668c239b442933c48a5b8c797cda088