Merge "Fix KeyguardViewMediatorTest." into udc-qpr-dev