[automerger skipped] Merge "Convert MediaOmx tests to parameterized gtest"...
[automerger skipped] Merge "Convert MediaOmx tests to parameterized gtest" into rvc-dev am: e09eaf2f -s ours am: fdda2580 -s ours
am skip reason: Change-Id Id1b8f6073c98db36c0ac86a881e7220ecfd0a71f with SHA-1 d6fea1ea is in history
Change-Id: I42254f18141fc8ea676e850d5ee8754422dbba15