Merge "Fix hotseat width to span a number of columns" into tm-dev am: a04ddba5 am: 026599f6

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



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