Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I68ec63721c4d8f307b57d408396369b65f0c0bca
Change-Id: I99fdcc27cd5911598531659b29850c0904b56c56