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

This reverts commit b5df8eaa12e963a5b012d5b9e44e9fe61edb58c0.