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

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

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