Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Icdc3a002fb8692aec06b62b607e738e258eb3298
Change-Id: Id6e73d5fdf15b1ec2879179cecacd3570f121a99