Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I4ac76e6ebd8fb178b12657bd2f505dc2b719e933
Change-Id: Icc79a2f085add198afa466748de0984ae694606e