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

Bug: 370570306
Merged-In: I1c2fb12e09ffe8083d6b14b0ee5aa957e031ddf3
Change-Id: Ic9f5cbcae1fdd40d57ca6d958adeb4b355339f68