Merge 24Q3 (ab/11976889) to aosp-main-future

Bug: 347831320
Merged-In: I96a795f5f00cbcd31c13dc61a7e394c403f9eb36
Change-Id: Icaf835319b358010ae83189eb1068267830c3acb