Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I2e802819614b547e8bf096a446ed48118a795e27
Change-Id: I2919f12c8c36a39ae6019dee407832047d3afe9c