Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: If3cbdd28acb0b8ca41a6a81d67f43f7ca8387e8f
Change-Id: I921825c3af3d37755146f46daa277b73138da3af