Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ic436003390c8feb4c5e9a36106abc1f7ab7f5a46
Change-Id: Ia2b25ed6f7c14923b93289c6260a50b1043848d8