Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Id1e1267ab774725d18687193c1e168dc543a1e7d
Change-Id: I2e0f086cb2ebcc02314163c6a91c63040bf2adaf