Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Iab622594932049cdc08d33f50bc817b056e2e577
Change-Id: I52d916629305e194c2aa96b2e3c13854734fda89