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

am skip reason: subject contains skip directive

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

Change-Id: I920935b22a37f3da923523ca8fdad4e87f7d9cd1