Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: Ie924cf59efd0dc9e97fb8a10f6ab3f2e7a7e4fd9
Change-Id: Id909a070908b91fe50e2e1fc26b951aeb4012669