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

Bug: 370570306
Merged-In: If13b6d231ba06bab6432eeb3aefb78f4f7d384a3
Change-Id: I31923906bd274572e94572b776d9c5384ea96539