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

Bug: 370570306
Merged-In: If459e2d5e31c685b331fbf52273a1f1ea8072b32
Change-Id: I37fedbdff3205f94794d567e2d9d78192639d65c