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

Bug: 370570306
Merged-In: Ifa8d3ed4c5a6c44bb988b0ed662c87f11ba9e9ee
Change-Id: Id7d07008f6b3c12c89b5e74a63290c11e5f347ac