Fix merge conflict

Author: romtsn

sentry-android-core/src/main/java/io/sentry/android/core/internal/util/AndroidConnectionStatusProvider.java

@@ -526,18 +526,6 @@ public NetworkCapabilities getCachedNetworkCapabilities() {
     return cachedNetworkCapabilities;
   }
 
-  /**
-   * Get the cached NetworkCapabilities for advanced use cases. Returns null if cache is stale or no
-   * capabilities are available.
-   *
-   * @return cached NetworkCapabilities or null
-   */
-  @TestOnly
-  @Nullable
-  public NetworkCapabilities getCachedNetworkCapabilities() {
-    return cachedNetworkCapabilities;
-  }
-
   /**
    * Return the Connection status
    *