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

[automerger skipped] Merge "Moving FingerprintSettings to Kotlin" into udc-qpr-dev-plus-aosp am: 1c7a2980 -s ours

am skip reason: Merged-In I8eb5c30e6f2e92c256ae7c257a9d560439ba418f with SHA-1 9642d1e8 is already in history

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



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