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

Bug: 370570306
Merged-In: Idd70cf3d846fad1a25060ebfb6ae6a99599fd861
Change-Id: I254edf09968accebbee718cb5494612d0e5031e7