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

Bug: 370570306
Merged-In: I05a99ecf218a8f8d99c585d5498c5dc2162e03c0
Change-Id: I1a44093e2a6755acbae96e39c046c25978ad57f7