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

Bug: 347831320
Merged-In: I2afd2143ceea10a15f3bb854e412c00324f44f71
Change-Id: I1eeb63492356d72ac476d203c5fbce795822972d