Merge "Fix Y icon positioning when prompt fields are empty." into udc-d1-dev...

Merge "Fix Y icon positioning when prompt fields are empty." into udc-d1-dev am: eb684814 am: c342770c

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



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