tree 3b97420390b5cf253867a1e8599156b3cc4c58d6
parent 9be016a6f4030dc3965971c40bf3f8c6d7db2450
parent e8b5895062daf543526b62cdbdbfbfa261b6fadb
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1746650846 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1746650846 -0700

Merge cherrypicks of ['googleplex-android-review.googlesource.com/33444909'] into 25Q2-release.

Change-Id: I4309ba53f451559864b02166fcbe64ef93b40f21