Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ice09a7ad54167e68cd2dc892692fc49a0afbabc1
Change-Id: If27a204b2e8db793efb9b5161449e79b75a4cdfd