tree 4dad4da2b1a2a09c6de16dfbb0cb255c9a2c64d3
parent dc420e9ce154836dfa220b47da96d6dce7d19df2
parent d710a37529d635993704bafc435214aa3f75c685
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1706635404 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1706635404 +0000

Merge cherrypicks of ['android-review.googlesource.com/2918225', 'android-review.googlesource.com/2933030'] into androidx-compose-release.

Change-Id: I7f84d7fa79eadec3d22034793673ac0a6d721c54