Revert mistaken commit of MediaDeviceSession
(cherry picked from commit 0c34515f4f6c0552cbf0419dfec6d3cbd6b9c995)