Merge "Refactor device padding to be set per grid option" into sc-dev am: 33f22c4e60

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

Change-Id: I60f9af2ba3e6043787e71ab7e23c7f6f86db7b45