Merge "Use updateButtonLayoutSpacing() for all states" into tm-qpr-dev am: cb26c1a245 am: 812bb6604d

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

Change-Id: Ib97b1cce072bcd58f32ba18817c498d533d6b57f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>