Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ia9b103579eea0859212523729a0d2e63b0f1c0fb
Change-Id: I97d4a38ad0d46172f6c1ff7979b4f230848b8132