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

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

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