Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ifdd331196740525edc7ae71075b409a61d0918d6
Change-Id: I92277cb84e21e42bee869f3b6b355f58952d442c