Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I07432e1683b38a0d29df1e62c71380646963314e
Change-Id: I9c8c512529e6cc1fd55fdee25f4febf9b785ce10