Merge "Prevent fingerprint icon from showing when unlocking while fingerprint...

Merge "Prevent fingerprint icon from showing when unlocking while fingerprint is in lockout." into sc-dev am: 598a7988

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

Change-Id: I745d9f381ffb24a565f1426b6b3d12b803d5f0e3