Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ib8fd53fa76fd1767d56653e0baae263d4f73c822
Change-Id: I451b500ad81e70b4a0fb71b456585e44ae0e6e2c