Merge "@Ignore for KeyguardControllerTest"