Merge "Fix widget span" into tm-dev am: ec3723beb1

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

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