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

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

Change-Id: I18942f9b176011fa9185bdceb39bda8f7a721c39