tree 2ccd69e661eb45cffa645061de5d4688dd471776
parent 3eb77bb2cf0eb4f9c9388ade1227db7ccb9ab28a
parent a1a4f4deed9c09e83b51ee503f20b5bcee2d121c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1712958063 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1712958063 +0000

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

Change-Id: Ib1e4e427c21be023f67c652669e2bcf6589f7c72