Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I624d3017a56da667598a7484e90479454b889632
Change-Id: Iee8d87899aa63c273d7d638f7cb3089ad81f8218