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: 26a5fe2f

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



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