Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ia495331d038bae2f53fafca9d972f3d22854a4c4
Change-Id: I42795d8c60347fa732726328c8fcc49f170ffc5f