Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Iaa1d8352b628aeb47f79a5c8e59256a3c45a2909
Change-Id: Ie23029dc17b8bee64cd8bfc9638057dc3d062950