Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I9af4651102eeba16468c3bae296801f62c1606b2
Change-Id: I5fef6f0a43f99a541f8d870408dce49d6ac889cc