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: I7698e9860109afe8550a3e4facd979e4d3094949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>