Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: If9ea56afc11e2978bc2b02cfeaf2ee08296a8804
Change-Id: I9081da2025d0e4829eb53d9a6df904562e77b065