Merge "MediaFrameworkTest: compare media type only for supported media check" into oc-dev
am: 486a202164

Change-Id: I970f6f2b12a6a5d243a002896864a47b20ab33a3