Merge 24Q3 (ab/11976889) to aosp-main-future

Bug: 347831320
Merged-In: I69e5f4125044c3a56e8f44f5bace7cca3d06717b
Change-Id: I9eb8a1dea258353071a17b1ffa5a6e69f194b818