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

Bug: 370570306
Merged-In: I4c21309c0898a52332be8e9f9483c92b59cc08c5
Change-Id: I2fe0c8c058bb49e22f3b61177918fd66195e71dd