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

Bug: 370570306
Merged-In: I9e3941f9ddea8785ec218d988e83294dd4346d52
Change-Id: I41d525d3fd7f9226567d4db8e127c1c35844aadb