[automerger skipped] Merge "Added fingerprint settings feature flag." into...

[automerger skipped] Merge "Added fingerprint settings feature flag." into udc-qpr-dev am: 84173b36 -s ours am: 6f4caaff -s ours

am skip reason: Merged-In Ifebc8e275c627135ff2285371a258f589fa444ab with SHA-1 edb29205 is already in history

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



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