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

Bug: 370570306
Merged-In: I7e92b26176f8467c0703b408a31b67384aa77b1f
Change-Id: Ib4e4e54b4ec7a0b287fbc37e88ced088f063c142