Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ia3c4e2b83d6bb0d87517683f4cc638bd740a5694
Change-Id: I4b524601ef589c05e8d93c54caa778990106f7c5