Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future Bug: 347831320 Merged-In: I0e7964742eaef420896facb906b505f38e38ee48 Change-Id: Ieb1fb01ad3d1edb6e4bf54c2daf970ece64385eb