Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev