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