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