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

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

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