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