Merge "Do not add padding left/right when cell layout border spacing exists." into sc-dev am: b7cab26529 am: 1bfcb7653b am: 7efb95d289

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

Change-Id: I1cab8390fe36d91d6e49832dbff380117e3e125d