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

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

Change-Id: I9e60082c8f451edfb4254f99114d268272047627