Merge "Remove PIN/PUK keyguard when SIM is removed/ready" am: 43f9f0290c
am: 434ccc8700

Change-Id: I1100fd308158f2bb369ed7043a84b79b4d36e204