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

Bug: 370570306
Merged-In: Iefe7acffac50ff14447b7d35c9c50e699637aba1
Change-Id: Ia2e58e626b548a36d1fe4c3e34cd3a5acea09bfe