Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I0b574089e609e8068fe987ecdda6b73da345115b
Change-Id: Id86c2ab896e453bddbed0e8c3b11255525ac7277