Merge "Fix widget span" into tm-dev am: ec3723be am: c85bab14 am: 9a2392a4

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



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