Merge "Fix flakey KeyguardIndicationControllerTest"