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

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

Change-Id: Ia2b9723e7ed1b6342fd1a31f36439e0949622a6f