Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I002afe0ac6ad47701ae9857fd344a350446aeada
Change-Id: Ia00ae9e536318a5f5164debb0339f910febd49fe