Merge "Fix "NetworkCallback was not registered" crash" into tm-dev am: 92538a9dbc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18619553

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

services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java

@@ -599,6 +599,7 @@ class GnssNetworkConnectivityHandler {
                     SUPL_NETWORK_REQUEST_TIMEOUT_MILLIS);
         } catch (RuntimeException e) {
             Log.e(TAG, "Failed to request network.", e);
+            mSuplConnectivityCallback = null;
             handleReleaseSuplConnection(GPS_AGPS_DATA_CONN_FAILED);
         }
     }