Merge 24Q4 (ab/12406339) into aosp-main-future

Bug: 370570306
Merged-In: I1db0b57c43836690e32bcf7143afcbaa3d6ec0f1
Change-Id: Icc2e359a5cbfa2ae53228c4af1312e49219a4469