tree 3d0d44f17cf75a2ccfd6ee2b52acf017f50bd2e2
parent 26e3ed41148e1a99a3d9baeeec55bc6c85313ca1
parent c11b71dde79adba40a85aa483b7c9a631dde08db
author TreeHugger Robot <treehugger-gerrit@google.com> 1632153098 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632153098 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I73bd1a7c87d5fc11e39b3a02989d08cc28743ed8