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