Merge "Fix an issue with concurrent modification on widget holders list" into...

Merge "Fix an issue with concurrent modification on widget holders list" into tm-qpr-dev am: f22345ea

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



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