Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: Ice2ff027776030379309ae9c6e869106cbfdc025
Change-Id: I61c84ba8ceb6849c53703698d332e567ff52096d