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

Bug: 347831320
Merged-In: Icc555cad17b734e2a9c035991c19bbdc6b02de5d
Change-Id: Ifc2f4879f01242b459614cc46fa66eb90cacd48d