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

Bug: 370570306
Merged-In: Ib678c12fe7050886efb8ff0faa55a191c6d4fbf1
Change-Id: I4f040c54b4bb73f7859a879ea56b10897af43f19