Merge cherrypicks of ['googleplex-android-review.googlesource.com/29548433'] into 24Q4-release.

Change-Id: I63a62b2155475790f47e5b5f4287bc397ac372e7
This commit is contained in:
Android Build Coastguard Worker 2024-09-30 17:32:25 +00:00
commit b0004bda32