tree 7318d1cc0ddff3afb510c305ec05bef5ca1c8b41
parent 6003569aeed2d30c3efbd106519d5c72040137e5
parent 1919f370fbd1f77c4840201765486e6d323aa4c8
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1742622645 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1742622645 -0700

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31326508', 'googleplex-android-review.googlesource.com/31723302'] into 25Q1-release.

Change-Id: I9bcf5dbfa33664fc798b2fc3378a6c865f5ced65