Merge "Use isTablet instead of isPhone for check" into tm-dev am: 3fd92a955e am: d1f2771aab am: 3504abc5ef am: 35519e28cb

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

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