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

Bug: 370570306
Merged-In: Id872631a932cff423f177a6a15bc99e221d592b0
Change-Id: I28805fa4f65edb4dcae5fec71cefa78a3a65bf66