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

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



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