Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I3c1c31b871275bf2b5ceb93120918f749f828cd1
Change-Id: I7da0085965df8fd7a5feb3ef0547e217f10a93b5