Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I07a0d65037c9aa250edebbccb8e09f63894fc2c9
Change-Id: Ibc59723a780e827a7d1a1275ddbb68db38cae22a