[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 am: c11b71dd -s ours am: 1d09637e -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib20188f020d22c34e4f109d5c2852956762dd148