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: 6d744cca

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

Change-Id: Id1c86d2d9f9d5d783d4473bf92c73fc4c1067178