[automerger skipped] Use setting as base activity for fingerprint am:...

[automerger skipped] Use setting as base activity for fingerprint am: 561a68db am: 84c9a630 -s ours

am skip reason: Merged-In Ib1c2ef9f93fb910eed2930f871c0c69bdb94bcbd with SHA-1 84b39c3e is already in history

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



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