Merge "VTS: Remove enforce codec2 on ATV for S devices" am: 842e6219c2

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2054806

Change-Id: Id16fe9b973ff934d0efb4c1d0af2ad4bb933e146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>