[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: fa6ff692 -s ours am: 2787f3a6 -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: Ifa35348e6ab3b5be528ec43b6a44c3dd04d835c5