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

Change-Id: Ifc77226ac149727ab0242044f3d9353c37035bf6