Merge changes from topic "revert-17983445-hotseat_span-WQWWPUHOTD" into tm-dev am: b0416cc478 am: 3b88baeaac

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

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