Merge 24Q4 into AOSP main

Bug: 370570306
Merged-In: I5f039a3c4a69eb6fb8c21fbf5849a85dea49e8f5
Change-Id: I817e86130c67eda9951ca013512106ca367fe44c