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