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

Bug: 370570306
Merged-In: I3874ee7d7eca14f13fb37d67fff738bcd55372b8
Change-Id: I08ec15ae923dafc13fc04212309f79601ef3ff62