Merge "Fix widget span" into tm-dev am: ec3723be am: 97e2f471 am: 9aa2d077

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



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