Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I92cce5f51a6d2463731ac5817e39a3934d538a52
Change-Id: I6eead3d09c08add04d1c3c4b9b43ccdb3a121c55