Merge "Add dismissKeyguardWithCallback to handle KeyguardService#dismiss." into main