Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev am: 52133e6916
am: 656f7e2090

Change-Id: Ibb71a72da783a03bb9fe96c8dc968402ce45b38a