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

Bug: 347831320
Merged-In: I048d3c9cea2d0564c7f6044fc6c239d98ff31242
Change-Id: Ieb9605395df0f9bd331c1b0f37ce1a77b75ef6c2