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: Ie183659b0034f15b0ba29c5ec25ee3adb1cdac6a