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

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

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