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: 541913bf am: 2fbb6728 am: 8a3d97f6
Change-Id: I80817e21c27dabe342508a1be98ebdabc35bad08