Merge changes from topic "am-96ef5016bb9d4f46a4b0f60bc70e05d3" into android12-tests-dev * changes: [automerger skipped] Merge "Limit DRC tests to default aac decoder and the ones that support xHE-AAC" into android11-tests-dev am: 5aa5e6c636 -s ours [automerger skipped] Limit DRC tests to default aac decoder and the ones that support xHE-AAC am: 1cc9d91898 -s ours