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

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

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