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

am: 52133e6916

Change-Id: I9fe96a428c918f1fc250b021ddd4d1c6fbdd061b
This commit is contained in:
Adrian Roos
2016-12-27 23:29:54 +00:00
committed by android-build-merger

Diff Content Not Available