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

Change-Id: I9fe96a428c918f1fc250b021ddd4d1c6fbdd061b