[automerger skipped] Added fingerprint settings feature flag. am: 4a3f76f0...

[automerger skipped] Added fingerprint settings feature flag. am: 4a3f76f0 -s ours am: 9cce6ec6 -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: I8767cdd24e519cfad1b07c40aaa61627b37fa9a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>