Merge "Add border spacing and fixed cell height to grid." into sc-dev am: 8dd4ddc7ae

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6a654cde19e1e0388c942b6be58bd8ea352420c