Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Iffe880b97e0296047b9e2b9c9929d67d09d257b6
Change-Id: Id0639727057fc3de20e987ac6c1f30c557d31219