Merge "Simplify KeyguardClockSwitch 1/N."