tree 180c8d327ae17d6c98de27679cc824eb23563165
parent edd1d3fe947bac7b593e7d5f0ed8a000a354fd9d
parent 8d39bf70865446b522ee6f2964e5c6d99a76a47b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1711496330 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1711496330 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26600571', 'googleplex-android-review.googlesource.com/26598679'] into 24Q2-release.

Change-Id: Id5fed6a4385d6511688589a324a8d6b1f737140a