Merge "Keyguard: Don't lock if SIM is NOT_READY" into nyc-mr2-dev