Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ia3df4631258f3615057db9f7efe5fa2edd76c6cb
Change-Id: I827c42dc559863c3b9acf931983094c3e7605c1c