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

Bug: 370570306
Merged-In: I96035d6b36e4f66d4530c4864bed8f44fa45161b
Change-Id: I6df2ea922caee70aee4977c696c1fcef17162deb