Merge "Fixing spacing between folder icon and folder itself" into udc-dev am: b9a88db27c am: 59802b88ae

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

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