Merge 24Q4 (ab/12406339) into aosp-main-future

Bug: 370570306
Merged-In: I1065c5443246d2da24e74e6bc3d4eaab30fd96dd
Change-Id: I24cf39fd3ced7433e0b0ad2ee38bd55634edb834