Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I9a0a0344ea49b0ef050834f418fdfa16d4e4375e
Change-Id: I1d39cc542e3af6132821a800e901e15ed8f88f1d