Merge "Fix bug where lockout timeout is shown for SIM in keyguard" into klp-dev