Merge "CodecListTest is not part of MTS" into tm-mainline-prod am: 9e72de62eb am: 943db3f351 am: c24a37d33a

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

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