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

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

Change-Id: I94636e49f32568161f5a608ef3f1da3eadb7a026