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

Change-Id: Ic89af8cf4e8530abfb5b7819eaa821b45178ae79
This commit is contained in:
Android Build Coastguard Worker 2024-11-05 12:30:39 +00:00
commit f60ceeb09b