Merge 24Q3 (ab/11976889) to aosp-main-future Bug: 347831320 Merged-In: I23cbadc31c48413afcdf52cc6d3768611b9df083 Change-Id: Ia00b1a0c814f2a797f8e9696632f45ba453e5d19