[automerger skipped] Fixed NPE in FingerprintAuthClient am: b5997d47 am:...

[automerger skipped] Fixed NPE in FingerprintAuthClient am: b5997d47 am: 7838fca5 -s ours am: 31c0c91e -s ours

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

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

Change-Id: Ic2d6154a0017f15fc92390d059ba246dde6f9e67