Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I8bd82a9744a43be82498b45cab40cb07de02a700
Change-Id: I0089309745319a069deebde89286eebb154851a1