[automerger skipped] Merge "Fixed NPE in FingerprintAuthClient" into sc-v2-dev am: e9002545 am: 16948bab -s ours

am skip reason: Merged-In I2f946cae240009af6963284c54825ab7b5efcc40 with SHA-1 c7cc5b86 is already in history

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

Change-Id: Icf1fd5a21e3b123d345fc32a4146f1506afd6d46