Merge changes from topic "presubmit-am-03c717081b8041d984fabd05965efce5"
* changes:
[automerge] Ask user to try fingerprint after face auth fail 2p: e1aa212d 2p: 073639ab
[automerge] Ask user to try fingerprint after face auth fail 2p: e1aa212d
Ask user to try fingerprint after face auth fail