Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I13a4ed323416d2887f5e9b2f38a7d4e34871c9d3
Change-Id: I76c0605d90acf6d07cbb8529bf3bcd0776ec6073