[automerger skipped] Merge "Update hotseat sizing for 4x5 grids." into sc-dev...

[automerger skipped] Merge "Update hotseat sizing for 4x5 grids." into sc-dev am: 6d9e8666 am: 4a371faa -s ours

am skip reason: Merged-In I9fd4f0da3f2bc9f0b38a621ad1192533260379e3 with SHA-1 374336a5 is already in history

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

Change-Id: Ibf1cbc9bdb694b3bd81cd679a29dba5eff880612