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

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

Change-Id: I21daf5db49b09bfd96af0868564f138efb455944