Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Iee49ffd94ac72ef063a8478735232829d06469d8
Change-Id: I9b72bc4f70d8e950d847f29c5174e63e2350601a