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