Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ieae21e4716d39c7e1b73ae6128032abcbcfa689a
Change-Id: Ib48024588ac7a3f4ca74c8ce8ab130325abf36ab