Merge "Fixing ConcurrentModificationException in FirstScreenBroadcast" into tm-dev am: 69149d07ff am: 0210441e55

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

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