Merge "Update lock icon view when biometrics cleared" into tm-qpr-dev am: 6651ac51 am: ecf55b23

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



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