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

Bug: 347831320
Merged-In: Ida2cbd05582d3f059e0208738f81f9f4a49620a7
Change-Id: I0b658152e8091e01f7d45594def47045d474cde2