Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ica1cc1bcf44205f6ccfb09529a52107b1c5091b3
Change-Id: I71566642f409b4d6a1a74635868ab5ea3fbe5b0a