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

Bug: 347831320
Merged-In: I40d73e79075893826492b85c27e35eed59b4b289
Change-Id: Ieb9d3bcbe2a941f32b4ca4d211022a82baded76d