am 7f210cbb: am 103a734b: Merge "Fix bug where lockout timeout is shown for...
am 7f210cbb: am 103a734b: Merge "Fix bug where lockout timeout is shown for SIM in keyguard" into klp-dev
* commit '7f210cbb':
Fix bug where lockout timeout is shown for SIM in keyguard