Merge "UserAwareBiometricScheduler lifecycle fix." into tm-d1-dev am: 9a277a47 am: 5eddca21

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



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