Merge "DO NOT MERGE Show keyguard when SIM is removed" into nyc-mr2-dev
am: b9bcde0444

Change-Id: I958f0a1d10dacfee874e52f9a92bcec637e26f84