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

Merge "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: 3bbe6ee6" into tm-d1-dev-plus-aosp am: 33c188d5 am: c30e863b

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



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