Merge "Merge "don't skip omx video codecs for ATV S and below" into tm-dev am:...

Merge "Merge "don't skip omx video codecs for ATV S and below" into tm-dev am: ad44d135 am: 9b676b39" into tm-d1-dev-plus-aosp am: ca18e21d am: 2a67e51b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18720544



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