Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Id140d86d72b41b715d07528c01ef44a6a5373b83
Change-Id: If41a5e5c0fa20440489ba5c4e8131ae609be19e4