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

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

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