Merge branch 'main' into renovate/com.android.tools.build-gradle-8.x

Merge branch 'main' into renovate/com.android.tools.build-gradle-8.x #94