Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I34dfb8901c549d821ae47aa2e4c1953f83e5514f
Change-Id: I68445490e68c91e7b926f13370a22dafdf1386d3