tree 9f89bf4085db92a7f24e89e37cdde64b9e86d35c
parent 273acf83ad934d815db8290cee872e3e8376be37
parent acddcf0406c9c1efb9ef290f7b8b37291df09627
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1685454068 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1685454068 +0000

Merge cherrypicks of ['android-review.googlesource.com/2597166', 'android-review.googlesource.com/2597106'] into androidx-compose-beta-release.

Change-Id: Id265a685a9af6a4a9b75bb1bf69f28cdf2c2c63b