Don't recreate keyguard for MCC/MNC changes.

Change-Id: I9e5dfdb12df522dc7dd50c26f35aba26b1bbe44e
Merge "Don't recreate keyguard for MCC/MNC changes." into du44