[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 am: 94951245 -s ours am: b8baeb7b -s ours

am skip reason: Merged-In I4d215ee8d3a0495fee36a21e8a650cb08f911ba7 with SHA-1 21a710db is already in history

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



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