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

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



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