[automerger skipped] Merge "Fixed NPE in FingerprintAuthClient" into sc-dev am: ec8c7fcf03 -s ours am: bbffdd574d -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: Ia5e86616cc1fedd20a533da5b6f5cabbae0d6523
This commit is contained in: