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

Bug: 370570306
Merged-In: I067dabf40385a39994d50cfa1f15a99aad5a3b6a
Change-Id: I2f224850e18055fda5653cbc345fe15f5f8923dd