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 am: 4b492c37 am: 4a515082

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

Change-Id: If109af67983751826d82af06e33e9423cf458fa7