Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I1065c5443246d2da24e74e6bc3d4eaab30fd96dd
Change-Id: I5fc41e6913a7a5a92d9acdba7a44ffef3fe44453