[automerger skipped] Merge "Show UDFPS icon on AOD even if fp auth isn't...

[automerger skipped] Merge "Show UDFPS icon on AOD even if fp auth isn't running" into sc-dev am: e835dab9 -s ours am: ed0f4f06 -s ours am: 79350e28 -s ours

am skip reason: Merged-In Id766df8f77427ae1db672507716bd38dc3462452 with SHA-1 e5be111d is already in history

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

Change-Id: Ib9e0c0940d0427197c96c739b24513005531450d