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

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

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