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

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

Change-Id: I38f06f2450a1de908f2d1dd797b412f0b64e2c0d