[automerger skipped] Merge "Only enable UDFPS display mode for optical...

[automerger skipped] Merge "Only enable UDFPS display mode for optical sensors" into tm-qpr-dev-plus-aosp am: 82990e4f -s ours

am skip reason: Merged-In I4d215ee8d3a0495fee36a21e8a650cb08f911ba7 with SHA-1 22fd130c is already in history

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



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