Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Idd3360fd629347a35012c43a512feac609dba0ec
Change-Id: I39778b2f5cabdcbcf0a4978f81f947d2288dc789