Merge ab/AP4A.240925.013 into aosp-main-future

Bug: 370570306
Merged-In: I90b57a86788c61a8f90ec4f7a6528ba68bc85d44
Change-Id: Ibef4cbd4976d3a4a540fe2cda1bea79d3266e866