Merge "Merge "Fix UDFPS alignment for shared code across new / legacy prompt." into udc-dev am: 53d81289 am: 3481962e" into udc-d1-dev-plus-aosp am: 63f8c88d

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



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