Merge "Prevents a ConcurrentModificationException in Widget" into sc-dev am: 3a37543fb9 am: 7d901cf67d am: 29ce6c4596

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

Change-Id: I26370908b67c1b0ddd93fe8e41ce67fd651b2fe8