Merge "Prevents a ConcurrentModificationException in Widget" into sc-dev am: 3a37543fb9

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

Change-Id: Ie541f45cb59037d2d9e50fec9fa0cd7aa04faf2b