Merge "When SIM absent, keyguard should be considered non-secure." into jb-dev