Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ied23023e8e14a85cb197f9eff6c7768e2940a293
Change-Id: Ide4a80891a3d2d439aa8accee339bb936b9fe08f