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

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

Change-Id: I7af0badb0d62d7792113530d4fb78095116bea63