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

Bug: 370570306
Merged-In: I7dcb9a44d65246e328038511d2cd684f8bbc4bc2
Change-Id: I4cf4a98cbb9e91133efba1b29f2b18f12ea593e0