Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I310cd8a614006c391407829ada587d892a0ac3b4
Change-Id: I7352c6fac044fffee32a33bbb3ec55db123e0d97