Merge "Remove dead code in KeyguardPasswordView" into main