Merge "Extend the MediaDeviceType to support more media device" into rvc-dev...
Merge "Extend the MediaDeviceType to support more media device" into rvc-dev am: 08348dea am: 21e62161 am: 3f7b3598 am: bd61ac64
Change-Id: If04485e4d443bdf83c5348493d5eaccefe19d256