Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ifacab4b9155dfc956a1dcf41af50acb152cd4ee1
Change-Id: I3b63a93fc23876c45fc526a0be229ee2fbe58438