Merge "Run biometric cleanup on user switch." into tm-dev am: 3bc43d43 am:...

Merge "Run biometric cleanup on user switch." into tm-dev am: 3bc43d43 am: 25af604c am: 1ef229e8

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



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