Merge "Use grid border spacing as widget padding if possible." into sc-dev am: 41a5c37009

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c37ad1649b5cbeb687765852be34b5212c717c1