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