[automerger skipped] Merge "Fixed NPE in FingerprintAuthClient" into sc-dev am: ec8c7fcf03 -s ours

am skip reason: Merged-In I3c310ab6a631750377a069e926567279bedc9d3b with SHA-1 78893c2317 is already in history

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

Change-Id: Icf738b8ece1e06248e1c454369371bdcb46ceb44