Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I91df897d8ae7d8e4b1b49a7eb20f6bb5fe99755c
Change-Id: Ifc0e5917fd9599c10bce7c5b99031b845bc2f95b