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

Bug: 370570306
Merged-In: Ic8c973caac761882481a6b2be319f41497012095
Change-Id: I2d67e4eac399528e93b675a17274fa79bf870e9b