Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I96a795f5f00cbcd31c13dc61a7e394c403f9eb36
Change-Id: Iadd7a0c9aca822961b50f2e7e5aee1510b31421c