[iOS] Need to be able to open Google services settings from incognito

Google services settings should be able to be opened from the incognito
mode.

Bug: 967674
Change-Id: I9008c0159b7729c17a7fc703c5a61171d2dd85e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1640555Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Auto-Submit: Jérôme Lebel <jlebel@chromium.org>
Commit-Queue: Jérôme Lebel <jlebel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#669094}

ios/chrome/app/main_controller.mm

@@ -1683,10 +1683,6 @@ enum class EnterTabSwitcherSnapshotResult {
     baseViewController = self.currentBVC;
   }
   DCHECK(![baseViewController presentedViewController]);
-  if ([self currentBrowserState]->IsOffTheRecord()) {
-    NOTREACHED();
-    return;
-  }
   if (_settingsNavigationController) {
     // Navigate to the Google services settings if the settings dialog is
     // already opened.
@@ -1695,8 +1691,10 @@ enum class EnterTabSwitcherSnapshotResult {
     return;
   }
 
+  ios::ChromeBrowserState* originalBrowserState =
+      self.currentBrowserState->GetOriginalChromeBrowserState();
   _settingsNavigationController = [SettingsNavigationController
-      newGoogleServicesController:self.currentBrowserState
+      newGoogleServicesController:originalBrowserState
                          delegate:self];
   [baseViewController presentViewController:_settingsNavigationController
                                    animated:YES