Merge "Merge "Fix UDFPS alignment for shared code across new / legacy prompt."...

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 am: 448585ab

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



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