Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I91f8c3bcba0c9977cc9bc828198d6c148c017f5e
Change-Id: I0cd2258d421861c4f74ea48aa3e65cedcbd6c152