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 am: add1d2a8
Change-Id: Ib605485e4bda5eb1ddd6fa552e6220584bd3261e