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

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

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