Merge "Fixed NPE in FingerprintAuthClient" into sc-v2-dev am: e90025458d

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

Change-Id: Ic34edb0acdd50bd98511fd86edf1d422660d0cbc