[automerger skipped] Merge "Refactor UDFPS display logic and remove...

[automerger skipped] Merge "Refactor UDFPS display logic and remove illumination" into tm-qpr-dev am: 1ecaa4d6 am: b5ce442c -s ours

am skip reason: Merged-In I285f136a75bbd26226a39c544f3c07101ff8eb80 with SHA-1 e4f579d6 is already in history

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



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