Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I08c190364da7089ea62b505fb563614863c2ff65
Change-Id: Ia816cc92fd46f308aab4202659577e429d5d3712