Merge "SIM PIN support." into jb-mr1-lockscreen-dev