Merge "Add vertical padding between Spinner texts" into udc-dev am: 0f8650e5 am: a1a07d94

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



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