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

Bug: 370570306
Merged-In: Ifc3f0526d470cc7bdfda8c610fc19bfdca73fe92
Change-Id: I00b44fc0a021e1df39e5287ff98c113341e548e5