Merge "Added fingerprint acquired too bright" into sc-dev am: 24a0b944 am:...

Merge "Added fingerprint acquired too bright" into sc-dev am: 24a0b944 am: 8684ec08 am: f8f4244f

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

Change-Id: I373dccd0d5d1a59d2e8a6750c3396a97abdf98d3