tree cf5efab513efee5ff713d9ea63c1c4f7399325e6
parent c535df00fcf5b767f980aaeac6cddfbcbffe7d25
parent 233f1acd274df6dccaf22a543d1344abc5325576
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1752716923 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1752716923 -0700

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

Change-Id: I4a289583d819db7c0131b2a3e993432d11d2142d