Merge "Modernize UDFPS views for maintainability" into udc-qpr-dev am: 682c51f5

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



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