Merge "Adjust icon spacing for text alignment" into udc-dev am: 4687a546

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21534526



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