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