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