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