Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I7ecda01549aedee5b0ee524afc3a246c345bfaad
Change-Id: Ic35eacd07376233c754724451a19a440c54fc2d6