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

Bug: 347831320
Merged-In: I8670ed30e15b540bbb8d8528e5125575a2535907
Change-Id: Iec72cd65a27756d23fd39159517c223308d2b581