[automerger skipped] Merge "Move UdfpsDisplayMode to AOSP" into tm-qpr-dev am:...

[automerger skipped] Merge "Move UdfpsDisplayMode to AOSP" into tm-qpr-dev am: f079495a am: 712f1c1a -s ours

am skip reason: Merged-In Ibf209f10e608814d1035b15299380b5eaa7632ee with SHA-1 63056aa9 is already in history

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



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