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

This reverts commit 28dcece574df81bc60f6d03b7c06a8783a80bee2.

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