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

Bug: 370570306
Merged-In: Ic78e619a04bcdaa767a2236f9a04fbe1d240a6c4
Change-Id: Id96e314049e1a58e26b08086e6299673c7db4e58