Merge "Fixing ConcurrentModificationException in FirstScreenBroadcast" into...

Merge "Fixing ConcurrentModificationException in FirstScreenBroadcast" into tm-dev am: 69149d07 am: e51b9d2b am: 67584c1c am: 3c841749

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



Change-Id: I7aaaa2be42b2a0ff8d6d0575458fb71c515967c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>