RUM-9899: Fix remaining issues

Author: satween

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/DatadogContextProvider.kt

@@ -17,6 +17,7 @@ internal class DatadogContextProvider(
     private val coreFeature: CoreFeature,
     private val featureContextProvider: FeatureContextProvider
 ) : ContextProvider {
+    @Suppress("LongMethod")
     override fun getContext(withFeatureContexts: Set<String>): DatadogContext {
         // IMPORTANT All properties should be immutable and be frozen at the state
         // of the context construction moment
@@ -57,12 +58,13 @@ internal class DatadogContextProvider(
                     architecture = architecture,
                     numberOfDisplays = numberOfDisplays,
                     localeInfo = with(coreFeature.androidInfoProvider) {
-                            LocaleInfo(
-                                locales = locales,
-                                currentLocale = currentLocale,
-                                timeZone = timeZone
-                            )
-                        })
+                        LocaleInfo(
+                            locales = locales,
+                            currentLocale = currentLocale,
+                            timeZone = timeZone
+                        )
+                    }
+                )
             },
             userInfo = coreFeature.userInfoProvider.getUserInfo(),
             accountInfo = coreFeature.accountInfoProvider.getAccountInfo(),

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/NoOpContextProvider.kt

@@ -56,10 +56,10 @@ internal class NoOpContextProvider : ContextProvider {
             architecture = "",
             numberOfDisplays = null,
             localeInfo = LocaleInfo(
-                    locales = emptyList(),
-                    currentLocale = "",
-                    timeZone = ""
-                )
+                locales = emptyList(),
+                currentLocale = "",
+                timeZone = ""
+            )
         ),
         userInfo = UserInfo(null, null, null, null, emptyMap()),
         accountInfo = null,