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

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



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