Merge 24Q4 (ab/12406339) into aosp-main-future Bug: 370570306 Merged-In: I125bac46e535a5866d5d01f305fd06c9b29967c3 Change-Id: I8580c7dadafd05aa2200a97fdfe8a820c1cb3fcf