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: c161196c am: 96ffc47c" into tm-qpr-dev-plus-aosp am: e79ce174

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



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