[automerger skipped] Merge "Removed lockdown check for detectFingerprint" into...

[automerger skipped] Merge "Removed lockdown check for detectFingerprint" into tm-qpr-dev am: 13ea38e0 am: 4c1289ff -s ours

am skip reason: Merged-In I0f0ee0d33312efc4b27fe6d525c7500d366fb3dc with SHA-1 9ec8976f is already in history

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



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