Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ifaa7f5438f1ad9a745a72a416bd80ea2f3fecae8
Change-Id: I249434d6262f3b0003a68a8ed3dd2d9189b66a6c