Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I2bb62ca28f73bf858e11eee4aa6c452e18db1ea4
Change-Id: I82cfa0227fb4480f73bbec0f91898e2ab24ed9af