Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ia5f14b6fac52940a9a6e17e3aa75e729dabea092
Change-Id: I2de9bc70e059b4eb93cd1a1ca5e928a52255ff4e