Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I99a33320941810c25bed5758e68a552642ae7d47
Change-Id: I16aa74e237fa8995a4112f5af0fcd811cde4fb76