Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I9293619aace80d52a3765f60f36bbddb8c3d8181
Change-Id: Ie3e3b48ad720169da0857e89e52b0265e8844ba1