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

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



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