Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I515e9162fb134a4de44f0503cd161575a8126f73
Change-Id: I253cf357726a8e9308fb655e266c9b58c2122535