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

Bug: 370570306
Merged-In: If0497fcc17bb0ec44294c4ea1163104b4d8be459
Change-Id: I3bdc59ea3914bcde4104f82de3ce6f8949f40e7d