[automerger skipped] Merge "Fixed NPE in FingerprintAuthClient" into sc-dev...

[automerger skipped] Merge "Fixed NPE in FingerprintAuthClient" into sc-dev am: ec8c7fcf -s ours am: bbffdd57 -s ours am: 0d61585b -s ours am: 4e38baff -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: Ibf62fcadfa6093d2567a9cd550fcf37ed8d83cc5