Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ica9a995eec0aff0924e174ab39ee468c32b6d5d0
Change-Id: I6c91a3e66f8b8942aa84a17c76c377312b37aa74