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

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



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