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

Bug: 347831320
Merged-In: Id2809adad9d49ba72fc9b65647229efbc4575140
Change-Id: I19c4a93113cee6b77b13585e9e29df89030d7f15