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