Merge "Allowing OMX.google* codecs for Devices launching with S" into tm-dev...

Merge "Allowing OMX.google* codecs for Devices launching with S" into tm-dev am: a2d4aee3 am: 99287440 am: b3717c7c am: d304aee7

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



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