Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I8458f223fc35fcfa042588e67a30c5bb273b0277
Change-Id: I2d2f964a53fdf9160d2897e81ea762b3a754def0