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

Change-Id: Ia4f3436c63f6c98b5753ddb7ac9f2a26e8633e3f
This commit is contained in:
Android Build Coastguard Worker 2024-09-30 17:32:16 +00:00
commit c4736a60c0