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

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

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