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: 558a2ab0 am: 9b76f80f" into tm-qpr-dev-plus-aosp am: b60265ad

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



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