[automerger skipped] Merge "Move fingerprint and face haptic form server to sysui(1/3)" into tm-qpr-dev am: b6639e64e3 am: 4570fe8058 -s ours
am skip reason: Merged-In I16a847358fc0d4a5d486275a76a97a5195b2dddb with SHA-1 794db1b7f7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20284929
Change-Id: If77ce05a2fe20cfdd13d824956a9bf17cc1c043c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: