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

Bug: 347831320
Merged-In: Ia5f14b6fac52940a9a6e17e3aa75e729dabea092
Change-Id: I4a92975b33336bec192f0f48cd9b0d4f55e5b34b