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

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



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