Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ib22110553aa2b8fc950d721d04bd1ffc32db578e
Change-Id: Icf9cf8b147488ea194b154b680c7442a2912bb3c