Merge "Fix flaky null pointer in LauncherWidgetHolder" into udc-dev am: 2b06cbc748 am: d9a7a143f8

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

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