Merge "Ask user to try fingerprint after face auth fail" into tm-dev am: b121b54f am: 4c7027aa

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



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