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