Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I14cff8dfe4e143995b9011cd34a1e7d74613ae33
Change-Id: Ic2a51a2ac1a142369dd49e4b6eb0dd37c32f1383