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