Merge ab/AP4A.240925.013 into aosp-main-future Bug: 370570306 Merged-In: Ifff2ece190b95607032e2b6a9c9c1de3b8668a28 Change-Id: Id650dd31594a6714faeb63d6cf95ae8ed70fb1cb