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

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

Change-Id: I9e8206df8211936965578ea8ed5545c81948b80c