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

Bug: 347831320
Merged-In: I3a7fb89b44b8df11d5fd71ed8635576f7d74ff87
Change-Id: I11751a3d94188293cacbaa7dbd71b69b177b732f