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

Bug: 370570306
Merged-In: Ie3d75a1e0b2843bee739f1247c4d526992d70298
Change-Id: I79b03ebf9ddba59891c494f842257e7e6e83b00c