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

Bug: 370570306
Merged-In: Ia508932b942f396f39d86e6236288bc7f73efd32
Change-Id: I493b09212237d2c9263d247d14d64663a27274b0