Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Iecb8804965686f8c9a913054c33e93a46c870c94
Change-Id: Ib434a44f7fb35651138d3f9059e4cc6d50936173