Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I3f42ca89e76335b16397b57fdc616d4096c78fea
Change-Id: If9f8870425586bf614482a66ac942042557f3ac5