Revert "No ticket - Point glean submodule to release branch (#5201)"

This reverts commit 18bbbcd.

.gitmodules

@@ -29,7 +29,3 @@
 	path = 3rdparty/glean
 	url = https://github.com/mozilla/glean.git
 	branch = main
-	branch = release
-[submodule "3rdparty/sentry"]
-	path = 3rdparty/sentry
-	url = https://github.com/getsentry/sentry-native/

scripts/linux/script.sh

@@ -132,7 +132,7 @@ print Y "Update the submodules..."
 git submodule init || die "Failed"
 git submodule update --remote --depth 1 i18n || die "Failed"
 git submodule update --remote --depth 1 3rdparty/wireguard-tools || die "Failed"
-git submodule update --depth 1 3rdparty/glean || die "Failed"
+git submodule update --remote --depth 1 3rdparty/glean || die "Failed"
 print G "done."
 
 print G "Creating the orig tarball"

vpnglean/src/lib.rs

@@ -34,7 +34,6 @@ pub extern "C" fn glean_initialize(is_telemetry_enabled: bool, data_path: FfiStr
         uploader: Some(Box::new(VPNPingUploader::new())),
         // Whether Glean should schedule “metrics” pings for you
         use_core_mps: true,
-        trim_data_to_registered_pings: false,
     };
 
     let client_info = ClientInfoMetrics {
@@ -50,34 +49,3 @@ pub extern "C" fn glean_initialize(is_telemetry_enabled: bool, data_path: FfiStr
 pub extern "C" fn glean_set_upload_enabled(is_telemetry_enabled: bool) {
     glean::set_upload_enabled(is_telemetry_enabled);
 }
-
-#[no_mangle]
-pub extern "C" fn glean_test_reset_glean(is_telemetry_enabled: bool, data_path: FfiStr) {
-    let cfg = Configuration {
-        data_path: data_path
-            .to_string_fallible()
-            .expect("Invalid Glean data path.")
-            .into(),
-        application_id: GLEAN_APPLICATION_ID.into(),
-        upload_enabled: is_telemetry_enabled,
-        // Default is 500
-        max_events: None,
-        // Whether Glean should delay persistence of data from metrics with ping lifetime
-        delay_ping_lifetime_io: false,
-        // Default is "https://incoming.telemetry.mozilla.org"
-        server_endpoint: None,
-        // Use the Glean provided one once https://bugzilla.mozilla.org/show_bug.cgi?id=1675468 is resolved
-        uploader: Some(Box::new(VPNPingUploader::new())),
-        // Whether Glean should schedule “metrics” pings for you
-        use_core_mps: true,
-        trim_data_to_registered_pings: false,
-    };
-
-    let client_info = ClientInfoMetrics {
-        app_build: env!("BUILD_ID").to_string(),
-        app_display_version: env!("APP_VERSION").to_string(),
-        channel: Some("testing".to_string()),
-    };
-
-    glean::test_reset_glean(cfg, client_info, true);
-}