Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ida2cbd05582d3f059e0208738f81f9f4a49620a7
Change-Id: I14114b8bc2f51676cfd456de9af9a93cb95aef68