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

Bug: 347831320
Merged-In: Id1e1267ab774725d18687193c1e168dc543a1e7d
Change-Id: Id60e845a9c5546f68d70bb05c9fb7d3741fc625b