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

Bug: 347831320
Merged-In: I0a13dde9a788bdf167a84a471ee463c833615890
Change-Id: I463f6e9c8c99f67d9e3ac4ba976219010a897a1c