Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I8474e73e2714ee72633075aeb8de710f19f813fa
Change-Id: Ic2ecb5375ddd3b1f6550f295a0c8607fc01ac1a1