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

Bug: 347831320
Merged-In: I72523e1de61e5f947174272b732e170e1c2964df
Change-Id: I72820c965561d6ea3d6a1527853206ed6de5d2c5