Merge ab/AP4A.241205.013 into aosp-main-future Bug: 370570306 Merged-In: I8bd82a9744a43be82498b45cab40cb07de02a700 Change-Id: Ib376453b31bad1623e4e5b1ce8fed0858f6aa161