Revert "Don't recreate keyguard for MCC/MNC changes."

This reverts commit 8db0f99bd52836f0d8962016cc09c506c8822393.

Change-Id: I2e4588fec21342f44a2ef73b9ce0003c38a08235
Merge "Revert "Don't recreate keyguard for MCC/MNC changes."" into kk4.4