Merge "Fix UDFPS alignment for shared code across new / legacy prompt." into udc-dev am: 53d81289

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



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