[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 am: f46705ca -s ours am: 130c974d -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: I57f30da58d5328680b99fd2c6d26378e8544b49a