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

This reverts commit d4ed6f64dfeccf110292e6e20b1ddd0e517b6fed.