Merge "Allow 5 hotseat icons in tablet 3 button" into tm-dev am: bfa953b230 am: 82df031e6b

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

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