Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I41300e2f6e2d916f8084c23a5e31a33f70f7d5e2
Change-Id: I3672f40508f68bb20529bd91aff4c43cd612e72f