Merge "KeyguardViewMediatorTest - Flaky test fix" into sc-v2-dev