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

Change-Id: I9416c37c4ca716d613f4d1ee262e2b4eb1502963