[automerger skipped] Merge "On strongAuthChanges, update fp & face states"...

[automerger skipped] Merge "On strongAuthChanges, update fp & face states" into tm-qpr-dev am: 60ccbef8 am: 8a26d9e1 -s ours

am skip reason: Merged-In If03a1525832dfb8366c36757ebc84c0dead51b9f with SHA-1 5e844042 is already in history

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



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