Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I87a006565caefe7287752fafd2375769949145ed
Change-Id: I7d8441d3c1292c6f76a29fbf058d8dc10fa8d924