Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I3ed83b9356f05307eb051b97c1327ad1974e8578
Change-Id: Ibbf591e1cec3d52d438e5a3502bfb3f436921086