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

Bug: 370570306
Merged-In: Id70ceed141e2106f746d4a0e68a09675ba45dd28
Change-Id: I84eee058761cb1fe716a7c91c022dbf435efbe7e