Merge "Update FP failure logic when device is unlocked" into tm-qpr-dev am: a858b620

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



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