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