Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Id7156a6a24bd202aa32e71f52fd23882b40e9be8
Change-Id: I6971b8d3d35a9b985f1cb7fbe236010392985cd6