[automerger skipped] Merge "Re-calculate non-UDFPS fingerprint location...

[automerger skipped] Merge "Re-calculate non-UDFPS fingerprint location onConfigChanged." into tm-qpr-dev am: 30e34bca am: 4b378dda -s ours

am skip reason: Merged-In I4de30d67d878f24ca240daa711521562f427ff7d with SHA-1 059066e3 is already in history

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



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