Merge "Merge "Always update lockscreen UDFPS icon's progress" into tm-dev am:...

Merge "Merge "Always update lockscreen UDFPS icon's progress" into tm-dev am: 3f28fc99 am: 4af46473" into tm-d1-dev-plus-aosp am: fe7960df am: e34e6001

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



Change-Id: I80c5014ebdb25d115fd3325552134604dee0bd6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>