Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I1d7baa7027f263a66063f3453e4ebab807652a63
Change-Id: I40f5887e34dbcb9791c5f5cb6ac2e892c61f4804