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

Bug: 370570306
Merged-In: I254866bec5845b396ecbf81330b6cff02fdc4628
Change-Id: Icbf38cb3945a9a53cb24f5ce09df7966ea6d5946