Merge "fixed scalable grid allApps to match home screen icons in largest...

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

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



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