Merge "Fix flaky UserAwareBiometricSchedulerTest" into sc-dev