Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I22e7a1a1dd310669bf6ab41b25577abdf4708848
Change-Id: Icc875c2485144d7cf2beb24f793e51ea376b00d9