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

Bug: 370570306
Merged-In: I30915c907c06f577d6428af8aa745dd94c674dc1
Change-Id: Ib0409a7c7113802cdb08693b81a4e9618071f8cc