Merge changes from topic "revert-17983445-hotseat_span-WQWWPUHOTD" into tm-dev am: b0416cc4

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



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