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

Bug: 370570306
Merged-In: I70318dc8b197a93d0f791ac968fc03b7aaf2efaa
Change-Id: Ic5fd57876db9d04b92c295660b68cc4504ecf831