Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I2a719a04dc045d2e70d3e32253d0fcd294745d17
Change-Id: I9fd2307425c8803262444c7d71a0f5b4c5ba1c46