fixup! Bug 42247: Android helpers for the TorProvider

Moved setSettings and TorLegacyAndroidSettings.setMigrated() into a new
if block in onPostExecute() from doInBackground().

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorIntegrationAndroid.java

@@ -175,8 +175,6 @@ public class TorIntegrationAndroid implements BundleEventListener {
             TorSettings settings;
             if (TorLegacyAndroidSettings.unmigrated()) {
                 settings = TorLegacyAndroidSettings.loadTorSettings();
-                setSettings(settings, true, true);
-                TorLegacyAndroidSettings.setMigrated();
             } else {
                 GeckoBundle bundle = message.getBundle("settings");
                 settings = new TorSettings(bundle);
@@ -187,6 +185,10 @@ public class TorIntegrationAndroid implements BundleEventListener {
         @Override
         protected void onPostExecute(TorSettings torSettings) {
             mSettings = torSettings;
+            if (TorLegacyAndroidSettings.unmigrated()) {
+                setSettings(mSettings, true, true);
+                TorLegacyAndroidSettings.setMigrated();
+            }
         }
     }