Merge "fixed scalable grid allApps to match home screen icons in largest display size" into tm-dev am: 5ba5c76c am: cd9cffe6 am: 03903669

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



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