Merge remote-tracking branch 'origin/upstream' am: b006f8d6dd am: 08a7b503b2

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlin-compose-compiler/+/2783043

Merge remote-tracking branch 'origin/upstream' am: b006f8d6dd am: 08a7b503b2

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlin-compose-compiler/+/27830438

Change-Id: I6b027858dde6938f2f901ccd5b4dc76611bd34b4
Signed-off-by: Automerger Merge Worker <[email protected]>

show more ...