Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I5c0fb04121f17f5ad4ebb0e5129cb10ab2710608
Change-Id: Ia1e9b6e09c1adf40095ad34c693a049580261e8c