Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I9ae3af899655057a07488fee2e085cd1884fcca0
Change-Id: I22eaba758765edcf2e0b8bd425907560b7e83658