Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I9590c44abb8cc1a2334ad4c882683db277662ef0
Change-Id: Ia59bc28357acde4ff3f6c17a3c5489955daa2323