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

Merge "VTS: Remove enforce codec2 on ATV for S devices" am: 842e6219 am: a5b65bd2 am: abce6a2e

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



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