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

Bug: 347831320
Merged-In: I34dfb8901c549d821ae47aa2e4c1953f83e5514f
Change-Id: I805d65458d80d0bb85e21cbcad3e8bdabbc8581e