Merge "Merge cherrypicks of ['android-review.googlesource.com/2612992'] into androidx-compose-material3-release." into androidx-compose-material3-release