Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future

Bug: 347831320
Merged-In: I4c24aae97ef052f6385281dd6e73f748d880decb
Change-Id: I04a50ea12d0df51e1c2cc57f43af2a7f1285c71c