Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future Bug: 347831320 Merged-In: Ida384900bea461edda20e7ba74fead57aaa8f7a7 Change-Id: I1794860b95ec03ef8f07d4a3e118a468983e6b85