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