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

Bug: 347831320
Merged-In: I9183c2f8b1cae60b705016804cb36780513be854
Change-Id: Ifc0af2d7b44642d06e3696a35ff7c64eb1bbc785