Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I271dc8c204b86c139b3ce39aec94992455948c31
Change-Id: I562e9942b5c058b4b5cdd60824d2d92ecebd0a1d