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

Bug: 370570306
Merged-In: I1b3f0c92d349e8c8760821cf50fb69997b67b242
Change-Id: If3811f22d85e2a9da9bb22aa18e9f079ce14344f