Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I9181b2344f2448b9debe1522528545ce90de8768
Change-Id: Ic5351ce6b46a46820c6d73d4f924c6b92d30b06d