Merge "Only update biometric state when keyguard is showing" into udc-dev am:...

Merge "Only update biometric state when keyguard is showing" into udc-dev am: 18929c87 am: 13874029

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



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