Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I4c21309c0898a52332be8e9f9483c92b59cc08c5
Change-Id: Ic2d6ac287d470bc7b0e9ffd1d89fe1f37517d5fd