Merge "Remove PIN/PUK keyguard when SIM is removed/ready" into oc-mr1-dev
am: 9938901bbc

Change-Id: I7b576ee7e38f141075cae094e3d1f74b7145d53f