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

Bug: 370570306
Merged-In: I24f28c7f36c13f94fb68b44a4a5a0ccebaad7158
Change-Id: Ibfc7403d076aceab74d37c09894bbcd73c89d47f