[automerger skipped] Merge "Performant auth update for fingerprint." into...

[automerger skipped] Merge "Performant auth update for fingerprint." into tm-qpr-dev am: 0eac7d33 am: 373692c1 -s ours

am skip reason: Merged-In Idb6e060553a4c7c6b637f13b42d421e44f3cbc15 with SHA-1 fd6f81a9 is already in history

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



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