Merge 24Q3 to AOSP main

Bug: 357762254
Merged-In: I07a98712e6f2fb3d1ce0a2e5f97693cdfbeb3582
Change-Id: I8717132b42def7a61cb227d4eed4e581c090bd30