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

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



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