[automerger skipped] [DO NOT MERGE] Show UDFPS icon on AOD even if fp auth...

[automerger skipped] [DO NOT MERGE] Show UDFPS icon on AOD even if fp auth isn't running am: e5be111d am: d5351da3 -s ours am: 26e3ed41 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibfe275e0446c1b6c39173b8f95ab19d694817392