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

Bug: 370570306
Merged-In: I977fa738050ae90d6f0cf7d0bb5d1f5a006ab696
Change-Id: If39bf65998fe85a3da4572cbfcf359a169f4de65