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: 206fbcae am: 95d2c542 am: 6b646901

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



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