Merge "App row padding is now consistent for all grid sizes. Also fix when 2x2...

Merge "App row padding is now consistent for all grid sizes. Also fix when 2x2 allApp icons get super big." into tm-dev am: 8536fb78 am: 22ffd190

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



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