Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Id872631a932cff423f177a6a15bc99e221d592b0
Change-Id: I403e05c8c5ad2dfa2d792f0550a450c8527229fd