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

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

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



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