Merge "UserAwareBiometricScheduler lifecycle fix." into tm-d1-dev am: 9a277a47 am: 78d2eeb1

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



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