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