Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Icec0b50f6421770e15c40b0676b49b95b035c230
Change-Id: Ie9a30dbc3cc6ad51e57c6e47009b2ab58b774d8d