Merge "Merge "KeyguardViewMediatorTest - Flaky test fix" into sc-qpr1-dev am: 2ac8e599 am: 24424ef4 am: 17a4c2b6"