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

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

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

Change-Id: Ia6af7e324380bc02426a3bc37b7719d6fed21031