Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I69125af882961c051d2e4b3846e51e019f0c80e5
Change-Id: I8319f989b8a3d259ccf5e61e10d7c31a051165b5