Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I614b7659db8bf01af5ae912d2c8e10c5a163c5a2
Change-Id: I78422c02babee4c663ba797306bfdf94dea0890b