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

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

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