Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I5a8f249a745fda3e51543464ca7ff597dc8d3c54
Change-Id: I53b79b8aa0191bb64d9f703abe7f8b022b7ef817