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

Change-Id: Icc0f45088e8f9d80047bd245ef00077eb4439fe1
This commit is contained in:
Android Build Coastguard Worker 2024-05-02 06:19:21 +00:00
commit c066aa2339