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

Merge "Fix hotseat width to span a number of columns" into tm-dev am: a04ddba5 am: 73a875ee am: eb710279

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



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