Fix lint issues and restore commented out code

libraries/network/src/main/kotlin/io/element/android/libraries/network/NetworkModule.kt

@@ -7,12 +7,12 @@
 
 package io.element.android.libraries.network
 
+import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.BindingContainer
 import dev.zacsweers.metro.ContributesTo
 import dev.zacsweers.metro.Provides
-import io.element.android.libraries.core.meta.BuildMeta
-import dev.zacsweers.metro.AppScope
 import dev.zacsweers.metro.SingleIn
+import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.network.interceptors.FormattedJsonHttpLogger
 import io.element.android.libraries.network.interceptors.UserAgentInterceptor
 import kotlinx.serialization.json.Json

libraries/network/src/main/kotlin/io/element/android/libraries/network/interceptors/UserAgentInterceptor.kt

@@ -7,11 +7,11 @@
 
 package io.element.android.libraries.network.interceptors
 
+import dev.zacsweers.metro.Inject
 import io.element.android.libraries.network.headers.HttpHeaders
 import io.element.android.libraries.network.useragent.UserAgentProvider
 import okhttp3.Interceptor
 import okhttp3.Response
-import dev.zacsweers.metro.Inject
 
 @Inject
 class UserAgentInterceptor(

libraries/network/src/main/kotlin/io/element/android/libraries/network/useragent/DefaultUserAgentProvider.kt

@@ -8,12 +8,12 @@
 package io.element.android.libraries.network.useragent
 
 import android.os.Build
-import dev.zacsweers.metro.ContributesBinding
-import io.element.android.libraries.core.meta.BuildMeta
 import dev.zacsweers.metro.AppScope
-import dev.zacsweers.metro.SingleIn
-import io.element.android.libraries.matrix.api.SdkMetadata
+import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
+import io.element.android.libraries.core.meta.BuildMeta
+import io.element.android.libraries.matrix.api.SdkMetadata
 
 @SingleIn(AppScope::class)
 @ContributesBinding(AppScope::class)