[automerger skipped] Moving FingerprintSettings to Kotlin am: 2f46489926
-s ours
am skip reason: Merged-In I8eb5c30e6f2e92c256ae7c257a9d560439ba418f with SHA-1 9642d1e8cb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23354293
Change-Id: Iac65e152e90559ff7398b3b075d057e443bba5e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: