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 am: 9b76f80f

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



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