Merge "MediaFrameworkTest: compare media type only for supported media check" into oc-dev am: 486a2021 am: 5ce3f13c Change-Id: I0ba42ce3186f15eefc6d8759ef41e0e9fe1ce41a