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

Bug: 370570306
Merged-In: I9b44cd82183214ce5c9faac8616ddfc0a127381f
Change-Id: Ia5e29433e22ad0bba04bd323c80bdd34310acb1a