Merge remote-tracking branch 'origin/main' into in-memory-datastore

Author: SimonMarquis

app/prodRelease-badging.txt

@@ -105,9 +105,9 @@ application-icon-640:'res/mipmap-anydpi-v26/ic_launcher.xml'
 application-icon-65534:'res/mipmap-anydpi-v26/ic_launcher.xml'
 application: label='Now in Android' icon='res/mipmap-anydpi-v26/ic_launcher.xml'
 launchable-activity: name='com.google.samples.apps.nowinandroid.MainActivity'  label='' icon=''
+uses-library-not-required:'android.ext.adservices'
 uses-library-not-required:'androidx.window.extensions'
 uses-library-not-required:'androidx.window.sidecar'
-uses-library-not-required:'android.ext.adservices'
 feature-group: label=''
   uses-feature: name='android.hardware.faketouch'
   uses-implied-feature: name='android.hardware.faketouch' reason='default feature for all apps'

compose_compiler_config.conf

@@ -1,5 +1,5 @@
 // This file contains classes (with possible wildcards) that the Compose Compiler will treat as stable.
-// It allows us to define classes that our not part of our codebase without wrapping them in a stable class.
+// It allows us to define classes that are not part of our codebase without wrapping them in a stable class.
 // For more information, check https://developer.android.com/jetpack/compose/performance/stability/fix#configuration-file
 
 // We always use immutable classes for our data model, to avoid running the Compose compiler