Merge "Add Keystore migration method to WifiMigration." into main