Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I33f28fb68f454c9451b7434afe17f9b520c97305
Change-Id: Ie402e20884a1bd45f332cdff1f372c9dd821e765