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: 558a2ab0

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



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