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

Bug: 347831320
Merged-In: I00e3bb72aa5d78fdf022ef5c92b0e47bf7a56d51
Change-Id: I7c9c0448f8776578ac441c24a5d08f13cb55503c