Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ib678c12fe7050886efb8ff0faa55a191c6d4fbf1
Change-Id: I631adf71b637d746b81988089384ec03f3af5504