Merge "Fixed NPE in FingerprintAuthClient" into sc-qpr1-dev am: 390edd0423

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

Change-Id: Ic7c63f6babe47911d7f908da684a0cdf634ae658