Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cbe4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467967

Change-Id: I0c24c04fb3bb769026e3794c461dddb926308219
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/network/telephony/NetworkSelectSettings.java

@@ -228,10 +228,10 @@ public class NetworkSelectSettings extends DashboardFragment {
 
     @Override
     public void onStop() {
-        super.onStop();
         if (mWaitingForNumberOfScanResults <= 0) {
             stopNetworkQuery();
         }
+        super.onStop();
     }
 
     @Override