[automerger skipped] Merge "Moving FingerprintSettings to Kotlin" into...

[automerger skipped] Merge "Moving FingerprintSettings to Kotlin" into udc-qpr-dev am: b1aaa313 -s ours am: 95e8ee65 -s ours

am skip reason: Merged-In I8eb5c30e6f2e92c256ae7c257a9d560439ba418f with SHA-1 2f464899 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23334106



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