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

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



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