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

[automerger skipped] Merge "[DO NOT MERGE] Show UDFPS icon on AOD even if fp auth isn't running" into sc-qpr1-dev am: 034a6251 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I08db6d4e0f0231697d5c501f9609685819e4a0b6