Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ie97ef69f6f9e7209e65c600ac78639a1c40e0fd5
Change-Id: I3fc34203fbc9c16d0aa9b032ee21811f11f3960b