tree 75ca748e465272b3404f7a8dec4be49ef9d0f1b6
parent edbe72575473d30fbe62372edd64689080b064b3
parent 08a9e4b81752e2cdbeb6fe7d2e8ba092b03c667a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1721419516 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1721419516 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28005500', 'googleplex-android-review.googlesource.com/28056600'] into 24Q3-release.

Change-Id: I3db921a415371f74855eb4a7cf948d33efd3ce0b