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

Bug: 370570306
Merged-In: I1695a4b6ff321ec0ed74da29c3238257ecec72d1
Change-Id: I1e028894152ce3d40e79f182a6937601c9f6d2d8